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/HzWarningServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzWarningServiceImpl.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzWarningServiceImpl.java
index 0ec1b03..61ac3e0 100644
--- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzWarningServiceImpl.java
+++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzWarningServiceImpl.java
@@ -29,7 +29,7 @@
@Override
public CommonPage selectWarningList(HzWarning warning) {
SysUser currentUser= SecurityUtils.getLoginUser().getUser();
- if(!currentUser.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode())){
+ if(!currentUser.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode()) && !currentUser.getUserType().equals(UserTypeEnum.CHECK_USER.getCode())){
warning.setCompanyId(currentUser.getCompanyId());
}
PageUtils.startPage();
@@ -85,11 +85,14 @@
}
@Override
- public Integer selectWarningCount() {
+ public Integer selectWarningCount(Long companyId) {
SysUser currentUser=SecurityUtils.getLoginUser().getUser();
if(currentUser.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode())){
throw new ApiException("管理员不能操作");
}
+ if (currentUser.getUserType().equals(UserTypeEnum.CHECK_USER.getCode())){
+ return baseMapper.selectWarningCount(companyId);
+ }
return baseMapper.selectWarningCount(currentUser.getCompanyId());
}
}
--
Gitblit v1.9.2