添加 逻辑标识adminSaasFlag = 0;

server/src/main/java/com/pica/cloud/account/account/server/service/impl/HospitalSaasUserServiceImpl.java

@@ -178,18 +178,17 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
         //手机号 解密脱敏
         lists.stream().forEach(t -> {
             List<RoleDto> roleDtos = doctorRoleMapper.selectRoleByUserId(t.getId());
+            List<Long> roleIds = roleDtos.stream().map(RoleDto::getId).collect(Collectors.toList());
             t.setRoles(roleDtos);
             String phone = EncryptUtils.decryptContent(t.getMobile(), EncryptConstants.ENCRYPT_TYPE_MOBILE, EncryptConstants.ENCRYPT_DECRYPT_KEY);
             String mixMobile = mixMobile(phone);
             t.setMobile(mixMobile);
 
-            if (req.getLoginFlag() == 1 && Objects.nonNull(t.getRoleId()) && (
-                    roleDtos.contains(SaasRoleEnum.SAAS_MAIN_ADMIN.getCode()) || roleDtos.contains(SaasRoleEnum.ADMIN_ROLE.getCode())) ||
-                    roleDtos.contains(SaasRoleEnum.MAIN_ADMIN_ROLE.getCode())) {
+            if (req.getLoginFlag() == 1 && CollectionUtils.isNotEmpty(roleIds) && (
+                    roleIds.contains(SaasRoleEnum.SAAS_MAIN_ADMIN.getCode()) || roleIds.contains(SaasRoleEnum.ADMIN_ROLE.getCode()) || roleIds.contains(SaasRoleEnum.MAIN_ADMIN_ROLE.getCode()))) {
                 t.setAdminSaasFlag(1);
             }
-            if (req.getLoginFlag() == 0 && Objects.nonNull(t.getRoleId()) && (
-                    roleDtos.contains(SaasRoleEnum.SAAS_MAIN_ADMIN.getCode()) || roleDtos.contains(SaasRoleEnum.ADMIN_ROLE.getCode()))
+            if (req.getLoginFlag() == 0  && CollectionUtils.isNotEmpty(roleIds) && (roleIds.contains(SaasRoleEnum.SAAS_MAIN_ADMIN.getCode()) || roleIds.contains(SaasRoleEnum.ADMIN_ROLE.getCode()))
             ) {
                 t.setAdminSaasFlag(1);
             }