From 57c42d5e9bcfd1761386743ae46668739cabe307 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 27 Jun 2023 10:33:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E5=95=86=E7=BB=8F=E7=90=86=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/dao/EnterpriseUserDAO.java | 7 +++++-- .../java/com/cool/store/mapper/EnterpriseUserMapper.java | 4 ++-- .../src/main/resources/mapper/EnterpriseUserMapper.xml | 8 +++----- .../com/cool/store/vo/EnterpriseUserSingleInfoVO.java | 2 +- .../store/service/impl/EnterpriseUserServiceImpl.java | 4 ++-- .../service/impl/workflow/InterviewWorkFlowService.java | 1 - .../service/impl/workflow/ReservationWorkFlowService.java | 1 - 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java index 6ff692687..afd1c6858 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java @@ -63,8 +63,11 @@ public class EnterpriseUserDAO { return enterpriseUserMapper.deleteUserByUserId(userId); } - public List searchUserByRegionIdsAndKeyword(List regionIds, String keyword, boolean isLeader){ - return enterpriseUserMapper.searchUserByRegionIdsAndKeyword(regionIds, keyword, isLeader); + public List searchUserByRegionIdsAndKeyword(List regionIds, String keyword, List leaderRegionIds){ + if(CollectionUtils.isEmpty(regionIds)){ + return Lists.newArrayList(); + } + return enterpriseUserMapper.searchUserByRegionIdsAndKeyword(regionIds, keyword, leaderRegionIds); } public boolean isExistDeptUser(String regionId){ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java index f83646ae2..1569c2d97 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java @@ -57,10 +57,10 @@ public interface EnterpriseUserMapper { * 根据关键字搜索部门下的用户 * @param regionIds * @param keyword - * @param isLeader + * @param leaderRegionIds * @return */ - List searchUserByRegionIdsAndKeyword(@Param("regionIds") List regionIds, @Param("keyword") String keyword, @Param("isLeader") boolean isLeader); + List searchUserByRegionIdsAndKeyword(@Param("regionIds") List regionIds, @Param("keyword") String keyword, @Param("leaderRegionIds") List leaderRegionIds); /** * 获取部门用户数 diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml index ffff404fd..47604c584 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml @@ -269,14 +269,12 @@ enterprise_user deleted = 0 - - and user_region_ids like concat("%", #{regionId}, "%") - + and user_region_ids like concat('%', #{regionId}, '%') and (name like concat("%", #{keyword}, "%") or mobile like concat("%", #{keyword}, "%")) - - and is_leader = 1 and leader_dept_ids in #{regionId} + + and user_region_ids like concat('%', #{regionId}, '%') diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserSingleInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserSingleInfoVO.java index c81cc4c40..1c1e80cb5 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserSingleInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserSingleInfoVO.java @@ -32,7 +32,7 @@ public class EnterpriseUserSingleInfoVO { for (EnterpriseUserDO enterpriseUser : userList) { String userId = enterpriseUser.getUserId(); boolean isContains = userIdMap.containsKey(userId); - if(isContains){ + if(!isContains){ EnterpriseUserSingleInfoVO result = new EnterpriseUserSingleInfoVO(); result.setUserId(userId); result.setUserName(enterpriseUser.getName()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java index 6b6ad4e77..c40c0e9ec 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java @@ -72,7 +72,7 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { List enterpriseUserDOS = new ArrayList<>(); if (CommonConstants.ALLOCATION.equals(type)){ if (userInfo.getIsLeader()){ - enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(new ArrayList<>(regionList), keyword, Boolean.TRUE); + enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(new ArrayList<>(regionList), keyword, JSONObject.parseArray(userInfo.getLeaderDeptIds(), String.class)); } if (CollectionUtils.isNotEmpty(regionList)){ //只有招商经理本人 @@ -81,7 +81,7 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { } //转交 所有的招商经理 if (CommonConstants.TRANSFER.equals(type)){ - enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(new ArrayList<>(regionList), keyword, Boolean.FALSE); + enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(new ArrayList<>(regionList), keyword, null); } return EnterpriseUserSingleInfoVO.convertVO(enterpriseUserDOS); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java index eb544ac4e..ed4d99aba 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java @@ -2,7 +2,6 @@ package com.cool.store.service.impl.workflow; import com.cool.store.enums.WorkflowStageEnum; import com.cool.store.request.CloseFollowRequest; -import com.cool.store.service.impl.WorkFlowServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/ReservationWorkFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/ReservationWorkFlowService.java index c4694dcee..36505a0e7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/ReservationWorkFlowService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/ReservationWorkFlowService.java @@ -2,7 +2,6 @@ package com.cool.store.service.impl.workflow; import com.cool.store.enums.WorkflowStageEnum; import com.cool.store.request.CloseFollowRequest; -import com.cool.store.service.impl.WorkFlowServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service;