需求

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

@@ -43,9 +43,6 @@ public class AdminUserCom extends AdminUser {
     private String contractSignInfo;
 
 
-    @ApiModelProperty("角色")
-    private AdminRole adminRole;
-
 
     @JsonIgnore
     public String getJoinNickName() {

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

@@ -41,7 +41,7 @@ public class UserVO     {
     @ApiModelProperty("网点名称")
     private String websitName;
 
-    @ZfireField(tbName = "b")
+    @ZfireField(tbName = "a")
     @ApiModelProperty("师傅编号")
     private String workerNumber;
 

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

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

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

@@ -127,7 +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)) {
@@ -153,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/user/UserLogic.java

@@ -387,8 +387,9 @@ public class UserLogic {
             }
 
 
-            if (userWaitService.lambdaQuery().in(UserWait::getMobile,userWait.getMobile()).eq(UserWait::getWebsitId,userWait.getWebsitId()).count()
-                    > 1)
+            if (!StringUtil.isEmpty(userWait.getWorkerNumber()) && userWaitService.lambdaQuery().in(UserWait::getWorkerNumber,userWait.getWorkerNumber())
+                    .eq(UserWait::getWebsitId,userWait.getWebsitId()).count()
+                    > 0)
                 throw new RemoteServiceException(userWait.getMobile()+"拥有这个网点");