From 198f42ec9f44943eb536e39a4bc2ce1f2a456694 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 16 Oct 2020 20:17:49 +0800 Subject: [PATCH] =?UTF-8?q?wx=5Fc=5Fuser=5Ftags=E6=B7=BB=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mem/WxCUserBasicInfoController.java | 2 +- .../iformall/controller/mem/WxCUserTagsController.java | 4 ++-- .../java/com/iformall/domain/po/base/TenantEntity.java | 3 --- .../java/com/iformall/mapper/WxCUserTagsMapper.java | 4 ++++ .../java/com/iformall/service/WxCUserTagsService.java | 6 +++--- .../iformall/service/impl/WxCUserTagsServiceImpl.java | 10 +++++----- .../src/main/resources/mapper/WxCUserTagsMapper.xml | 8 ++++++++ 7 files changed, 23 insertions(+), 14 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 7f0020469..bbaff64b6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -104,7 +104,7 @@ public class WxCUserBasicInfoController extends BaseController { private void setUserInfoTag(WxCUserBasicInfo info) { if (info.getTagId() != null) { - WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId()); + WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId(),info.getFinalTenantId()); if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(), Long.class); info.setTagsList(wxCUserTagsService.findTagList(ifParentUpdateTenantInfo(), ids)); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java index c021a78d5..1f430dbb5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java @@ -62,7 +62,7 @@ public class WxCUserTagsController extends BaseController { @SystemControllerLog(description = "会员首页-标签-删除") public ResultData delete(Long id) { logger.debug("[" + getIpAddr() + "] WxCUserTagsController::delete"); - wxCUserTagsService.deleteById(id); + wxCUserTagsService.deleteById(id,getTenantInfo().getFinalTenantId()); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -72,7 +72,7 @@ public class WxCUserTagsController extends BaseController { @SystemControllerLog(description = "会员首页-标签-查询") public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxCUserTagsController::findById"); - return new ResultData(Result.SUCCESS, "查询成功", wxCUserTagsService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxCUserTagsService.getById(id,getTenantInfo().getFinalTenantId())); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index e9955af58..04fa8c3bc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -35,9 +35,6 @@ public class TenantEntity extends BaseEntity { } } - @TableField(exist = false) - protected String finalTenantId; - public String getFinalTenantId() { if (!StringUtils.isBlank(parentTenantId)) { return parentTenantId; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java index 99b983566..f48d665fd 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java @@ -11,10 +11,14 @@ import org.apache.ibatis.annotations.Param; public interface WxCUserTagsMapper extends CommonMapper { + WxCUserTags selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + List findList(WxCUserTags wxCUserTags); long countUser(@Param("tagIds")String tagIds,@Param("tenantId")String tenantId, @Param("startTime")Date startTime,@Param("endTime")Date endTime); void updateNewId(CUserTagNewIdVo record); + + int deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java index 452384012..67d7fb9da 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java @@ -26,7 +26,7 @@ public interface WxCUserTagsService { * @param id * @return */ - WxCUserTags getById(Long id); + WxCUserTags getById(Long id,String tenantId); /** * 保存或更新实体 @@ -40,14 +40,14 @@ public interface WxCUserTagsService { * * @param id */ - void deleteById(Long id); + void deleteById(Long id,String tenantId); long countUser(TenantEntity tenantEntity, Long tagId, Date startTime, Date endTime ); List findTagList(TenantEntity tenantEntity, List tagIds); - List assignTags(List tagIdList, WxCUserBasicInfo user); + List assignTags(List tagIdList,WxCUserBasicInfo user); List triggerAssignTags(EnumAssignTagsTrigger trigger, Object obj); void updateTagByUserId(Long cUserId,TenantEntity tenantinfo, List tags); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index a95279b23..3bc7af76e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -63,8 +63,8 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { } @Override - public WxCUserTags getById(Long id) { - return wxCUserTagsMapper.selectById(id); + public WxCUserTags getById(Long id,String tenantId) { + return wxCUserTagsMapper.selectById(id,tenantId); } @Override @@ -82,8 +82,8 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { } @Override - public void deleteById(Long id) { - wxCUserTagsMapper.deleteById(id); + public void deleteById(Long id,String tenantId) { + wxCUserTagsMapper.deleteById(id,tenantId); } @@ -761,7 +761,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(cUserId,tenantinfo.getFinalTenantId()); WxCUserTags userTags = null; if (wxCUserBasicInfo.getTagId() != null) { - userTags = getById(wxCUserBasicInfo.getTagId()); + userTags = getById(wxCUserBasicInfo.getTagId(),wxCUserBasicInfo.getFinalTenantId()); } else { userTags = new WxCUserTags(); userTags.setTags("[]"); diff --git a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml index 4a77a27ac..7413fae57 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml @@ -62,6 +62,14 @@ order by ${sortColumns} + + + + + delete from wx_c_user_tags where id = #{id} and tenant_id = #{tenantId} +