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/HzProductServiceImpl.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzProductServiceImpl.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzProductServiceImpl.java
index aba9819..7b8f6ee 100644
--- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzProductServiceImpl.java
+++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzProductServiceImpl.java
@@ -51,9 +51,13 @@
         }
         SysUser currentUser = SecurityUtils.getLoginUser().getUser();
         checkUserAllowed(null,currentUser);
-        //设置分表id
-        IdTableNameHandler.setCurrentId(currentUser.getCompanyId());
-        product.setCompanyId(currentUser.getCompanyId());
+        if (currentUser.getUserType().equals(UserTypeEnum.CHECK_USER.getCode())){
+            IdTableNameHandler.setCurrentId(product.getCompanyId());
+        }else {
+            //设置分表id
+            IdTableNameHandler.setCurrentId(currentUser.getCompanyId());
+            product.setCompanyId(currentUser.getCompanyId());
+        }
         PageUtils.startPage();
         List<HzProduct> productList = baseMapper.selectProductList(product);
         IdTableNameHandler.removeCurrentId();
@@ -206,9 +210,14 @@
     public CommonPage selectProductGroupWarehouse(HzProduct product) {
         SysUser currentUser = SecurityUtils.getLoginUser().getUser();
         checkUserAllowed(null,currentUser);
-        //设置分表id
-        IdTableNameHandler.setCurrentId(currentUser.getCompanyId());
-        product.setCompanyId(currentUser.getCompanyId());
+        if (currentUser.getUserType().equals(UserTypeEnum.CHECK_USER.getCode())){
+            IdTableNameHandler.setCurrentId(product.getCompanyId());
+        }else {
+            //设置分表id
+            //todo
+            IdTableNameHandler.setCurrentId(currentUser.getCompanyId());
+            product.setCompanyId(currentUser.getCompanyId());
+        }
         PageUtils.startPage();
         List<HzProductWarehouseVO> productList = baseMapper.selectProductGroupWareHouse(product);
         if(!productList.isEmpty()) {

--
Gitblit v1.9.2