no message

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

@@ -73,9 +73,10 @@ public interface CommonMapper {
      * 师傅列表
      * @param page
      * @param zfireParamBean
+     * @param isWait
      * @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("isWait") Boolean isWait);
 
 
     /**

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

@@ -114,10 +114,17 @@ public class UserLogic {
      */
     public IPage<UserVO> page2(WorkerParamBean userZfireParamBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
+        Boolean isWait = false;
+        if (CollectionUtils.isNotEmpty(userZfireParamBean.getParams())) {
+            final long count = userZfireParamBean.getParams().stream()
+                    .filter(v -> v.getParam().equals("b.examine_status") && v.getValue().equals(ExamineStatusEnum.WAIT.getKey()))
+                    .count();
+            isWait = count > 0;
+        }
 
         ZfireParamBean zfireParamBean = FieldUtils.supplyParam(userZfireParamBean, UserVO.class, adminUser);
 
-        IPage<UserVO> userVOIPage = commonMapper.userList(new Page(userZfireParamBean.getPageNum(), userZfireParamBean.getPageSize()), userZfireParamBean, null);
+        IPage<UserVO> userVOIPage = commonMapper.userList(new Page(userZfireParamBean.getPageNum(), userZfireParamBean.getPageSize()), userZfireParamBean, null, isWait);
         return userVOIPage;
     }
 

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

@@ -103,7 +103,9 @@
             </foreach>
         </if>
         and a.apply_type='WORKER'
-        AND a.worker_number IS NOT NULL
+        <if test="isWait != null and isWait == true">
+            AND a.worker_number IS NOT NULL
+        </if>
         <if test="ex.isGroupByWorkerId != null and ex.isGroupByWorkerId == true">
             GROUP BY a.worker_number
         </if>