修改人员角色显示逻辑

server/src/main/java/com/pica/cloud/account/account/server/req/HospitalSaasUserListReq.java

@@ -31,6 +31,4 @@ public class HospitalSaasUserListReq {
     @ApiModelProperty("页码")
     private Integer pageNo = 1;
 
-    @ApiModelProperty("登录来源  0:saas 1:运营平台")
-    private Integer loginFlag = 0;
 }

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

@@ -91,7 +91,10 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
     public HospitalRoleResp listByPage(HospitalRoleListReq req) {
         Map<String, Object> map = new HashMap(4);
         if (req.getLoginFlag() == 1) {
-            List<Long> list = Arrays.asList(SaasRoleEnum.MAIN_ADMIN_ROLE.getCode(), SaasRoleEnum.ADMIN_ROLE.getCode(),SaasRoleEnum.SAAS_MAIN_ADMIN.getCode());
+            List<Long> list = Arrays.asList(SaasRoleEnum.MAIN_ADMIN_ROLE.getCode(), SaasRoleEnum.ADMIN_ROLE.getCode(), SaasRoleEnum.SAAS_MAIN_ADMIN.getCode());
+            map.put("list", list);
+        } else {
+            List<Long> list = Arrays.asList(SaasRoleEnum.MAIN_ADMIN_ROLE.getCode(), SaasRoleEnum.ADMIN_ROLE.getCode());
             map.put("list", list);
         }
         map.put("name", req.getName());

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

@@ -193,7 +193,7 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
             throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "参数错误");
         }
         validatorAdminRole(req.getRoleId(), req.getHospitalId().longValue());
-        if (CollectionUtils.isNotEmpty(req.getRoleId()) && (req.getRoleId().contains(SaasRoleEnum.MAIN_ADMIN_ROLE)) || req.getRoleId().contains(SaasRoleEnum.ADMIN_ROLE)) {
+        if (CollectionUtils.isNotEmpty(req.getRoleId()) && ((req.getRoleId().contains(SaasRoleEnum.MAIN_ADMIN_ROLE)) || req.getRoleId().contains(SaasRoleEnum.ADMIN_ROLE))) {
             throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "主管理员或系统管理员不可被编辑");
         }
         if (CollectionUtils.isNotEmpty(req.getRoleId()) && (req.getRoleId().contains(SaasRoleEnum.NULL_ROLE)) && req.getRoleId().size() > 1) {