From da2c594ade5d69621dd11a13bb758477e2dc079e Mon Sep 17 00:00:00 2001 From: “djh” <“3298565835@qq.com”> Date: 星期三, 07 五月 2025 15:57:51 +0800 Subject: [PATCH] 危化品新版修改 --- hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzProductBasicServiceImpl.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzProductBasicServiceImpl.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzProductBasicServiceImpl.java index 877a54f..bfc6f6f 100644 --- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzProductBasicServiceImpl.java +++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzProductBasicServiceImpl.java @@ -50,7 +50,7 @@ @Override public CommonPage selectProductBasicList(HzProductBasic productBasic) { 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())) { productBasic.setCompanyId(currentUser.getCompanyId()); } PageUtils.startPage(); @@ -79,6 +79,7 @@ HzSecientificVo hzSecientificVo = secientificMapper.selectBySecientificName(productBasic.getName()); productBasic.setPeculiarityType(hzSecientificVo!=null? hzSecientificVo.getPeculiarityType() : null); productBasic.setPeculiarityNumber(hzSecientificVo!=null ? hzSecientificVo.getPeculiarityNumber() : 0); + productBasic.setSecientificId(hzSecientificVo!=null? hzSecientificVo.getId() : null); if (!checkProductSnUnique(productBasic)) { throw new ApiException("产品编号已存在"); @@ -99,6 +100,10 @@ SysUser currentUser = SecurityUtils.getLoginUser().getUser(); checkUserAllowed(productBasic,currentUser); productBasic.setUpdateBy(currentUser.getUsername()); + HzSecientificVo hzSecientificVo = secientificMapper.selectBySecientificName(productBasic.getName()); + productBasic.setPeculiarityType(hzSecientificVo!=null? hzSecientificVo.getPeculiarityType() : null); + productBasic.setPeculiarityNumber(hzSecientificVo!=null ? hzSecientificVo.getPeculiarityNumber() : 0); + productBasic.setSecientificId(hzSecientificVo!=null? hzSecientificVo.getId() : null); int row=baseMapper.updateById(productBasic); if(row<1){ throw new ApiException("更新成品基础信息失败"); @@ -169,6 +174,7 @@ HzSecientificVo hzSecientificVo = secientificMapper.selectBySecientificName(productBasic.getName()); productBasic.setPeculiarityType(hzSecientificVo!=null? hzSecientificVo.getPeculiarityType() : null); productBasic.setPeculiarityNumber(hzSecientificVo!=null ? hzSecientificVo.getPeculiarityNumber() : 0); + productBasic.setSecientificId(hzSecientificVo!=null? hzSecientificVo.getId() : null); productBasic.setKind(kind); productBasic.setMinPackage(minPackage); productBasic.setCompanyId(currentUser.getCompanyId()); -- Gitblit v1.9.2