no message

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -79,10 +79,13 @@ public interface CommonMapper {
      * 师傅列表
      * @param page
      * @param zfireParamBean
-     * @param isOK
+     * @param slaveWorkerList
      * @return
      */
-    public IPage<UserVO> userList(IPage page, @Param("ex") WorkerParamBean zfireParamBean, @Param("type") UserTypeEnum type);
+    public IPage<UserVO> userList(IPage page,
+                                  @Param("ex") WorkerParamBean zfireParamBean,
+                                  @Param("type") UserTypeEnum type,
+                                  @Param("slaveWorkerList") List<String> slaveWorkerList);
 
 
     /**

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -88,6 +88,7 @@ public class UserLogic {
     private final PgOrderWorkerService pgOrderWorkerService;
     private final SettleDailyBankAccountService settleDailyBankAccountService;
     private final WebsitUserLogService websitUserLogService;
+    private final WorkerTeamService workerTeamService;
 
 
     /**
@@ -117,7 +118,23 @@ public class UserLogic {
 
         ZfireParamBean zfireParamBean = FieldUtils.supplyParam(userZfireParamBean, UserVO.class, adminUser);
 
-        IPage<UserVO> userVOIPage = commonMapper.userList(new Page(userZfireParamBean.getPageNum(), userZfireParamBean.getPageSize()), userZfireParamBean, null);
+        List<String> slaveWorkerList = null;
+        if (StringUtils.isNotBlank(userZfireParamBean.getMaserWorkerId())) {
+            final List<WorkerTeam> teamList = workerTeamService.lambdaQuery()
+                    .and(v -> v.eq(WorkerTeam::getMasterWorkerId, userZfireParamBean.getMaserWorkerId())
+                            .or()
+                            .eq(WorkerTeam::getAssistantWorkerId, userZfireParamBean.getMaserWorkerId()))
+                    .list();
+            slaveWorkerList = teamList.stream().map(v -> {
+                if (v.getMasterWorkerId().equals(userZfireParamBean.getMaserWorkerId())) {
+                    return v.getAssistantWorkerId();
+                } else {
+                    return v.getMasterWorkerId();
+                }
+            }).collect(Collectors.toList());
+        }
+
+        IPage<UserVO> userVOIPage = commonMapper.userList(new Page(userZfireParamBean.getPageNum(), userZfireParamBean.getPageSize()), userZfireParamBean, null, slaveWorkerList);
         return userVOIPage;
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/zfire/bean/WorkerParamBean.java

@@ -13,4 +13,7 @@ public class WorkerParamBean extends ZfireParamBean {
 
     @ApiModelProperty(value = "是否检查师傅证件")
     private Boolean checkCert = Boolean.FALSE;
+
+    @ApiModelProperty(value = "主要工程师")
+    private String maserWorkerId;
 }

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -102,6 +102,12 @@
         <if test="ex.checkCert != null and ex.checkCert == true">
             AND b.examine_status IN ('OK', 'EXPIRED')
         </if>
+        <if test="slaveWorkerList != null and slaveWorkerList.size > 0">
+            AND a.user_id IN
+            <foreach item="item" index="index" collection="slaveWorkerList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         and a.apply_type='WORKER'
         <if test="ex.isGroupByWorkerId != null and ex.isGroupByWorkerId == true">
             GROUP BY a.worker_number