From 437f8e2b89a18363a1073fdbb3ab99bcd840a757 Mon Sep 17 00:00:00 2001 From: “djh” <“3298565835@qq.com”> Date: 星期一, 21 四月 2025 10:51:36 +0800 Subject: [PATCH] 危化品新版修改 --- hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/SysUserServiceImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/SysUserServiceImpl.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/SysUserServiceImpl.java index 56ab843..0824059 100644 --- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/SysUserServiceImpl.java +++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/SysUserServiceImpl.java @@ -129,7 +129,7 @@ } public void checkRequestData(SysUser user){ - if(!user.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode())&&user.getCompanyId()==null){ + if(!(user.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode()) || user.getUserType().equals(UserTypeEnum.CHECK_USER.getCode()) )&&user.getCompanyId()==null){ throw new ApiException("所属公司不能为空"); } if(!checkUsernameUnique(user)){ @@ -193,8 +193,8 @@ Integer currentUserType=currentUser.getUserType(); Integer userType=user.getUserType(); if(currentUserType.equals(UserTypeEnum.SYSTEM_USER.getCode())){ - if(!userType.equals(UserTypeEnum.COMPANY_USER.getCode())&&!userType.equals(UserTypeEnum.SYSTEM_USER.getCode())){ - throw new ApiException("管理员只能操管理员和企业级用户"); + if(!userType.equals(UserTypeEnum.COMPANY_USER.getCode())&&!userType.equals(UserTypeEnum.SYSTEM_USER.getCode())&&!userType.equals(UserTypeEnum.CHECK_USER.getCode())){ + throw new ApiException("管理员只能操作管理员和企业级用户"); } }else if(user.getId()!=null&& user.getId().equals(currentUser.getId())){ return; -- Gitblit v1.9.2