Merge remote-tracking branch 'origin/dev' into dev

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -227,7 +227,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
                                 .or()
                                 .or()
                                 .eq(PlatUser::getMobile, dto.getMobile())
                                 .eq(PlatUser::getMobile, dto.getMobile())
                                 .or()
                                 .or()
-                                .eq(PlatUser::getEmail,dto.getEmail())
+                                .eq(StringUtils.isNotBlank(dto.getEmail()),PlatUser::getEmail,dto.getEmail())
                         )
                         )
 
 
         );
         );
@@ -239,7 +239,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
             if (e.getMobile().equals(dto.getMobile()) && !e.getId().equals(dto.getId())) {
             if (e.getMobile().equals(dto.getMobile()) && !e.getId().equals(dto.getId())) {
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_MOBILE_DUPLICATE);
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_MOBILE_DUPLICATE);
             }
             }
-            if (e.getEmail().equals(dto.getEmail()) && !e.getId().equals(dto.getId())) {
+            if (StringUtils.isNotBlank(dto.getEmail()) && e.getEmail().equals(dto.getEmail()) && !e.getId().equals(dto.getId())) {
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_MAIL_DUPLICATE);
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_MAIL_DUPLICATE);
             }
             }
         });
         });
@@ -1133,10 +1133,11 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
         orgLambdaQueryWrapper.select(BaseEntity::getId, PlatOrg::getName);
         orgLambdaQueryWrapper.select(BaseEntity::getId, PlatOrg::getName);
         List<PlatOrg> orgList = platOrgService.list(orgLambdaQueryWrapper);
         List<PlatOrg> orgList = platOrgService.list(orgLambdaQueryWrapper);
         LambdaQueryWrapper<PlatRole> roleLambdaQueryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<PlatRole> roleLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        roleLambdaQueryWrapper.select(BaseEntity::getId, PlatRole::getName);
+        roleLambdaQueryWrapper.select(BaseEntity::getId, PlatRole::getName,PlatRole::getOrgId);
         List<PlatRole> roleList = platRoleService.list(roleLambdaQueryWrapper);
         List<PlatRole> roleList = platRoleService.list(roleLambdaQueryWrapper);
         Map<String, PlatOrg> orgNameMap = orgList.stream().collect(Collectors.toMap(PlatOrg::getName, vo -> vo, (a, b) -> a));
         Map<String, PlatOrg> orgNameMap = orgList.stream().collect(Collectors.toMap(PlatOrg::getName, vo -> vo, (a, b) -> a));
-        Map<String, String> roleNameMap = roleList.stream().collect(Collectors.toMap(PlatRole::getName, BaseEntity::getId, (a, b) -> a));
+        //要区分每个组织下的角色
+        Map<String, String> roleNameMap = roleList.stream().collect(Collectors.toMap(vo->vo.getOrgId()+vo.getName(), BaseEntity::getId, (a, b) -> a));
 
 
         LambdaQueryWrapper<PlatUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<PlatUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
         userLambdaQueryWrapper.select(PlatUser::getMobile, PlatUser::getEmail, BaseEntity::getId);
         userLambdaQueryWrapper.select(PlatUser::getMobile, PlatUser::getEmail, BaseEntity::getId);
@@ -1155,7 +1156,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
                 ExcelErrorVo.isNotNull(dto.getOrgName(), errorVoList, start + i, "*所属组织");
                 ExcelErrorVo.isNotNull(dto.getOrgName(), errorVoList, start + i, "*所属组织");
                 PlatOrg platOrg = Optional.ofNullable(orgNameMap.get(dto.getOrgName())).orElse(new PlatOrg());
                 PlatOrg platOrg = Optional.ofNullable(orgNameMap.get(dto.getOrgName())).orElse(new PlatOrg());
                 ExcelErrorVo.notExists(platOrg.getId(), errorVoList, start + i, "*所属组织");
                 ExcelErrorVo.notExists(platOrg.getId(), errorVoList, start + i, "*所属组织");
-                ExcelErrorVo.notExists(roleNameMap.get(dto.getRoleName()), errorVoList, start + i, "*角色");
+                ExcelErrorVo.notExists(roleNameMap.get(platOrg.getId()+dto.getRoleName()), errorVoList, start + i, "*角色");
                 ExcelErrorVo.exists(mobileMap, dto.getMobile(), errorVoList, start + i, "手机号*");
                 ExcelErrorVo.exists(mobileMap, dto.getMobile(), errorVoList, start + i, "手机号*");
                 ExcelErrorVo.exists(emailMap, dto.getEmail(), errorVoList, start + i, "邮箱");
                 ExcelErrorVo.exists(emailMap, dto.getEmail(), errorVoList, start + i, "邮箱");
             }
             }
@@ -1176,7 +1177,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
                     platUsers.add(platUser);
                     platUsers.add(platUser);
                     PlatUserRole platUserRole = new PlatUserRole();
                     PlatUserRole platUserRole = new PlatUserRole();
                     platUserRole.setUserId(platUser.getId());
                     platUserRole.setUserId(platUser.getId());
-                    String roleId = roleNameMap.get(vo.getRoleName());
+                    String roleId = roleNameMap.get(platOrg.getId()+vo.getRoleName());
                     platUserRole.setRoleId(roleId);
                     platUserRole.setRoleId(roleId);
                     platUserRoles.add(platUserRole);
                     platUserRoles.add(platUserRole);
                 });
                 });