添加 逻辑标识adminSaasFlag = 0;

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

@@ -182,10 +182,15 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
             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()) && t.getRoleId() < SaasRoleEnum.SAAS_DOCTOR.getCode()) {
+
+            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())) {
                 t.setAdminSaasFlag(1);
             }
-            if (req.getLoginFlag() == 0 && Objects.nonNull(t.getRoleId()) && t.getRoleId() < SaasRoleEnum.SAAS_MAIN_ADMIN.getCode()) {
+            if (req.getLoginFlag() == 0 && Objects.nonNull(t.getRoleId()) && (
+                    roleDtos.contains(SaasRoleEnum.SAAS_MAIN_ADMIN.getCode()) || roleDtos.contains(SaasRoleEnum.ADMIN_ROLE.getCode()))
+            ) {
                 t.setAdminSaasFlag(1);
             }
         });