招商经理搜索

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<EnterpriseUserDO> searchUserByRegionIdsAndKeyword(List<String> regionIds, String keyword, boolean isLeader){
+    public List<EnterpriseUserDO> searchUserByRegionIdsAndKeyword(List<String> regionIds, String keyword, List<String> leaderRegionIds){
-        return enterpriseUserMapper.searchUserByRegionIdsAndKeyword(regionIds, keyword, isLeader);
+        if(CollectionUtils.isEmpty(regionIds)){
+            return Lists.newArrayList();
+        }
+        return enterpriseUserMapper.searchUserByRegionIdsAndKeyword(regionIds, keyword, leaderRegionIds);
     }
 
     public boolean isExistDeptUser(String regionId){

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<EnterpriseUserDO> searchUserByRegionIdsAndKeyword(@Param("regionIds") List<String> regionIds, @Param("keyword") String keyword, @Param("isLeader") boolean isLeader);
+    List<EnterpriseUserDO> searchUserByRegionIdsAndKeyword(@Param("regionIds") List<String> regionIds, @Param("keyword") String keyword, @Param("leaderRegionIds") List<String> leaderRegionIds);
 
     /**
      * 获取部门用户数

coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml

@@ -269,14 +269,12 @@
             enterprise_user
         <where>
             deleted = 0
-            <if test="regionIds != null and regionIds.size()>0">
+            and <foreach collection="regionIds" item="regionId" separator=" or " open="(" close=")">user_region_ids like concat('%', #{regionId}, '%')</foreach>
-                and <foreach collection="regionIds" item="regionId" separator="or" open="(" close=")"> user_region_ids like concat("%", #{regionId}, "%") </foreach>
-            </if>
             <if test="keyword != null">
                 and (name like concat("%", #{keyword}, "%") or mobile like concat("%", #{keyword}, "%"))
             </if>
-            <if test="isLeader!= null and isLeader">
+            <if test="leaderRegionIds != null and leaderRegionIds.size()>0">
-                and is_leader = 1 and leader_dept_ids in <foreach collection="regionIds" item="regionId" separator="," open="(" close=")">#{regionId}</foreach>
+                and <foreach collection="leaderRegionIds" item="regionId" separator=" or " open="(" close=")">user_region_ids like concat('%', #{regionId}, '%')</foreach>
             </if>
         </where>
     </select>

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());

coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java

@@ -72,7 +72,7 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService {
         List<EnterpriseUserDO> 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);
     }

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;
 

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;