no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -891,7 +891,7 @@ public class AdminWebsitLogic {
             addWebsit.setWebsitPhone(row.get(16).toString().trim());
             addWebsit.setPayWorkerCodeId(wechatPayConfig.getId());
             addWebsit.setIsUseAllinpay(isUseAllinpay);
-            addWebsit.setInsureType(insureType);
+            addWebsit.setInsureType(insureType.replace("，", ","));
             addWebsit.setPayInsureCodeId(insurePayConfigId);
             addWebsit.setInsureSteadUnit(Objects.nonNull(steadUnit) ? steadUnit.getDictCode() : null);
             addWebsit.setOpenBank(row.get(17).toString().trim());

mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerTeamLogic.java

@@ -11,14 +11,8 @@ import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.enums.material.StateEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.User;
-import com.gree.mall.manager.plus.entity.WebsitUser;
-import com.gree.mall.manager.plus.entity.WorkerTeam;
-import com.gree.mall.manager.plus.entity.WorkerTeamApply;
-import com.gree.mall.manager.plus.service.UserService;
-import com.gree.mall.manager.plus.service.WebsitUserService;
-import com.gree.mall.manager.plus.service.WorkerTeamApplyService;
-import com.gree.mall.manager.plus.service.WorkerTeamService;
+import com.gree.mall.manager.plus.entity.*;
+import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.excel.ExcelUtils;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
@@ -45,6 +39,7 @@ public class WorkerTeamLogic {
     private final WebsitUserService websitUserService;
     private final UserService userService;
     private final WorkerTeamApplyService workerTeamApplyService;
+    private final UserWaitService userWaitService;
 
     public IPage<WorkerTeamVO> list(ZfireParamBean zfireParamBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
@@ -120,6 +115,7 @@ public class WorkerTeamLogic {
                 .eq(WebsitUser::getWebsitId, websitId)
                 .ne(StringUtils.isNotBlank(workerId), WebsitUser::getWorkerNumber, workerId)
                 .eq(WebsitUser::getExamineStatus, ExamineStatusEnum.OK.getKey())
+                .groupBy(WebsitUser::getWorkerNumber)
                 .list();
         if (CollectionUtil.isEmpty(websitUsers)) {
             return new ArrayList<>();
@@ -128,13 +124,21 @@ public class WorkerTeamLogic {
                 .eq(User::getCompanyWechatId, adminUser.getCompanyWechatId())
                 .in(User::getUserId, websitUsers.stream().map(WebsitUser::getUserId).collect(Collectors.toList()))
                 .list();
+
+//        final List<UserWait> waitList = userWaitService.lambdaQuery()
+//                .eq(UserWait::getCompanyWechatId, adminUser.getCompanyWechatId())
+//                .in(UserWait::getWorkerNumber, websitUsers.stream().map(WebsitUser::getWorkerNumber).collect(Collectors.toList()))
+//                .list();
+
         final Map<String, String> userMap = userList.stream().collect(Collectors.toMap(User::getWorkerNumber, User::getNickName));
         List<WebsitWorkerBean> beanList = new ArrayList<>();
         for (WebsitUser websitUser : websitUsers) {
-            WebsitWorkerBean bean = new WebsitWorkerBean();
-            bean.setWorkerId(websitUser.getWorkerNumber());
-            bean.setWorkerName(userMap.get(websitUser.getWorkerNumber()));
-            beanList.add(bean);
+            if (userMap.containsKey(websitUser.getWorkerNumber())) {
+                WebsitWorkerBean bean = new WebsitWorkerBean();
+                bean.setWorkerId(websitUser.getWorkerNumber());
+                bean.setWorkerName(userMap.get(websitUser.getWorkerNumber()));
+                beanList.add(bean);
+            }
         }
         return beanList;
     }