人员角色权限控制

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

@@ -197,11 +197,11 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
         if (accountExist == null) {
             throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "当前用户不存在");
         }
-        HospitalSaasUserEditResp resp = accountMapper.selectUserRoleById(req.getId());
-        if (req.getLoginFlag() == 1 && Objects.nonNull(resp) &&  !Objects.equals(req.getRoleId(), resp.getRoleId()) && req.getRoleId() != 0 && resp.getRoleId() < SaasRoleEnum.SAAS_MAIN_ADMIN.getCode()) {
+        HospitalSaasUserEditResp saasUser = accountMapper.selectUserRoleById(req.getId());
+        if (req.getLoginFlag() == 1 && saasUser != null && saasUser.getRoleId() != null && !Objects.equals(req.getRoleId(), saasUser.getRoleId()) && req.getRoleId() != 0 && saasUser.getRoleId() < SaasRoleEnum.SAAS_MAIN_ADMIN.getCode()) {
             throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "当前角色不可编辑");
         }
-        if (req.getLoginFlag() == 0  && Objects.nonNull(resp) &&!Objects.equals(req.getRoleId(), resp.getRoleId()) && req.getRoleId() != 0 && resp.getRoleId() < SaasRoleEnum.SAAS_DOCTOR.getCode()) {
+        if (req.getLoginFlag() == 0 && saasUser != null && saasUser.getRoleId() != null && !Objects.equals(req.getRoleId(), saasUser.getRoleId()) && req.getRoleId() != 0 && saasUser.getRoleId() < SaasRoleEnum.SAAS_DOCTOR.getCode()) {
             throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "当前角色不可编辑");
         }
         Account account = new Account();