需求

mall-server-api/src/main/java/com/gree/mall/manager/bean/admin/AdminUserCom.java

@@ -1,10 +1,7 @@
 package com.gree.mall.manager.bean.admin;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
-import com.gree.mall.manager.plus.entity.AdminDept;
-import com.gree.mall.manager.plus.entity.AdminUser;
-import com.gree.mall.manager.plus.entity.AdminWebsit;
+import com.gree.mall.manager.plus.entity.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -46,6 +43,10 @@ public class AdminUserCom extends AdminUser {
     private String contractSignInfo;
 
 
+    @ApiModelProperty("角色")
+    private AdminRole adminRole;
+
+
     @JsonIgnore
     public String getJoinNickName() {
         return "(" + this.getUserName() + ")" + this.getNickName();

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/UserVO.java

@@ -58,9 +58,6 @@ public class UserVO     {
     @ZfireField(hide = true, tbName = "b")
     private String slaveWorkerId;
 
-    @ZfireField(tbName = "d", colName = "nick_name", ignoreSelect = true)
-    @ApiModelProperty("辅助师傅")
-    private String slaveWorkerName;
 
     @ApiModelProperty("用户类型")
     private UserTypeEnum type;

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

@@ -266,7 +266,8 @@ public class LetterLogic {
         //1.组装查询条件
         zfireParam = FieldUtils.supplyParam(zfireParam, LeLetterVO.class, adminUser);
 
-        IPage<LeLetterVO> leLetterVOIPage = letterMapper.listLetter(page, zfireParam, adminCompanyIds,adminUser.getType().equals(0)?true:false);
+        IPage<LeLetterVO> leLetterVOIPage = letterMapper.listLetter(page, zfireParam, adminCompanyIds,
+                adminUser.getType().equals(0) && adminUser.getAdminRole().getType().equals(1) && adminUser.getAdminRole().getLevel().equals(0)?true:false);
         return leLetterVOIPage;
 
     }

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

@@ -215,7 +215,7 @@ public class SyncOrderInfoLogic {
 
             Map<String, Object> bodyMap = JSON.parseObject(body);
 
-            log.info(itfGreeSynRule.getSalesWebsitNumber()+time+"【工单同步数据内容】:" + bodyMap.toString());
+            log.info(itfGreeSynRule.getSalesWebsitNumber()+"时间为："+time+"【工单同步数据内容】:" + bodyMap.toString());
 
             String s = bodyMap.get("data").toString();
 

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

@@ -162,7 +162,8 @@ public class AdminWebsitLogic {
                 .like(!StringUtil.isEmpty(websitId), AdminWebsit::getWebsitId, websitId)
                 .like(!StringUtil.isEmpty(websitName), AdminWebsit::getName, websitName)
                 .eq(!StringUtil.isEmpty(attr), AdminWebsit::getAttr, attr)
-                .in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()) && (isAll == null || !isAll), AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()) && (isAll == null || !isAll),
+                        AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
                 .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatIds())
                 .and(Objects.nonNull(queryPartsWebsit) && queryPartsWebsit, v -> v.isNotNull(AdminWebsit::getPartsWebsitId)
                         .or()

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/CommonLogic.java

@@ -95,6 +95,9 @@ public class CommonLogic {
     @Autowired
     IncrKeyValueService incrKeyValueService;
 
+    @Autowired
+    AdminRoleService adminRoleService;
+
     public Map<String, String> getOSSConfig() throws UnsupportedEncodingException {
         return ossUtil.getConfig();
     }
@@ -124,6 +127,7 @@ public class CommonLogic {
             AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById("1");
             adminUserCom.setAdminCompanyWechat(adminCompanyWechat);
             adminUserCom.setJoinCode(adminCompanyWechat.getJoinCode());
+            adminUserCom.setAdminRole(adminRoleService.getById(admin.getRoleId()));
 
             List<AdminUserDeptRela> adminUserDeptRelas = adminUserDeptRelaService.lambdaQuery().in(AdminUserDeptRela::getAdminUserId, admin.getAdminUserId()).list();
             if (!CollectionUtils.isEmpty(adminUserDeptRelas)) {
@@ -149,7 +153,7 @@ public class CommonLogic {
         adminUserCom = new AdminUserCom();
         BeanUtils.copyProperties(adminUser,adminUserCom);
 
-
+        adminUserCom.setAdminRole(adminRoleService.getById(adminUser.getRoleId()));
 
         //商品出入库是否关联条码\
         AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(adminUser.getCompanyWechatId());

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -263,17 +263,29 @@ public class WorkerManagerLogic {
 
 
 
-        if (!StringUtil.isEmpty(user.getWorkerNumber())){
+        if (!StringUtil.isEmpty(user.getWorkerNumber())) {
             if (!workerManagerBean.getWorkerNumber().equals(user.getWorkerNumber())) {
                 throw new RemoteServiceException("师傅编号已经录入不允许更改");
             }
-        }
 
 
+            if (userService.lambdaQuery().eq(User::getWorkerNumber, workerManagerBean.getWorkerNumber())
+                    .ne(User::getUserId, workerManagerBean.getUserId()).count() > 0) {
+
+                if (websitUserService.lambdaQuery().eq(WebsitUser::getWorkerNumber, websitUser.getWorkerNumber())
+                        .ne(WebsitUser::getUserId, workerManagerBean.getUserId())
+                        .ne(WebsitUser::getExamineStatus, ExamineWorkerStatusEnum.QUIT.getKey()).count() > 0) {
+                    throw new RemoteServiceException("已有该师傅编号");
+                }
 
-        if(userService.lambdaQuery().eq(User::getWorkerNumber,workerManagerBean.getWorkerNumber())
-                .ne(User::getUserId,workerManagerBean.getUserId()).count() > 0)
-            throw new RemoteServiceException("已有该师傅编号");
+                //离职师傅去除手机号
+                userService.lambdaUpdate().eq(User::getWorkerNumber, workerManagerBean.getWorkerNumber())
+                        .ne(User::getUserId, workerManagerBean.getUserId())
+                        .set(User::getWorkerNumber,"")
+                        .set(User::getType,"GENERAL").update();
+
+            }
+        }
 
 
         workerManagerBean.setBankAccount(workerManagerBean.getUser().getBankAccount());