From d807a79d8c91aca1f6aa4bf1e59a740fa832663d Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Thu, 24 Jul 2025 16:23:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coscosupplier/entity/CoscoAccessSupplierCategory.java | 3 +++ .../service/impl/CoscoAccessWorkCategoryServiceImpl.java | 4 ++-- .../service/impl/CoscoSupplierBaseServiceImpl.java | 8 ++++---- .../base/dao/mapper/CoscoAccessCategoryMapper.xml | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplierCategory.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplierCategory.java index fe8cf02..673de09 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplierCategory.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplierCategory.java @@ -23,6 +23,9 @@ public class CoscoAccessSupplierCategory extends CoscoBaseEntity { //准入单位 private String orgId; + //准入单位 + private String orgName; + // 准入部门id private String deptId; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java index 7634865..819ef6c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java @@ -230,10 +230,10 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg coscoAccessSupplierMapper.updateCoscoAccessSupplierByIds(coscoAccessSupplierUp); - //根据任务id与部门id查询需要准入的品类，并且排除每个供应商已存在该部门下的品类 + //根据任务id与单位id查询需要准入的品类，并且排除每个供应商已存在该单位下的品类 CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory(); coscoAccessCategory.setAccessWorkId(coscoAccessWorkData.getId()); - coscoAccessCategory.setDeptId(coscoAccessWorkData.getDeptId()); + coscoAccessCategory.setDeptId(coscoAccessWorkData.getOrgId()); List coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryByDeptIdList(coscoAccessCategory); //审批通过,将需要插入到已准入品类表的品类插入到数据库中 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java index 5f505cc..6d37835 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.entity.SysOrg; +import com.chinaunicom.mall.ebtp.common.base.entity.SysOrgVO; import com.chinaunicom.mall.ebtp.common.base.entity.SysSupplierUser; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; @@ -182,10 +183,9 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl page = new Page<>(vo.getPageNo(), vo.getPageSize()); IPage pageData = coscoAccessSupplierCategoryMapper.selectPageList(page, vo); for(CoscoAccessSupplierCategory category : pageData.getRecords()){ - SysOrg dept = orgService.getOrgInfo(category.getDeptId()); - if(!ObjectUtils.isEmpty(dept)){ - category.setDeptName(dept.getOrgName()); - } + OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(category.getDeptId()); + category.setOrgName(orgDeptVo.getOrgName()); + category.setDeptName(orgDeptVo.getDeptName()); category.setCategoryName(coscoCategoryService.getCategoryNameById(category.getCategoryId())); } return pageData; diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessCategoryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessCategoryMapper.xml index c0525ff..8aaf4a8 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessCategoryMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessCategoryMapper.xml @@ -32,7 +32,7 @@ left join cosco_access_category cac on caw.id = cac.access_work_id left join cosco_access_supplier cas on caw.id = cas.access_work_id LEFT JOIN cosco_supplier_base csb ON cas.supplier_id = csb.id and csb.del_flag = 'normal' - LEFT JOIN cosco_access_supplier_category casc ON casc.category_id = cac.category_id AND casc.dept_id = #{deptId} and cas.supplier_id = casc.supplier_id and casc.del_flag = 'normal' + LEFT JOIN cosco_access_supplier_category casc ON casc.category_id = cac.category_id AND casc.org_id = #{deptId} and cas.supplier_id = casc.supplier_id and casc.del_flag = 'normal' where caw.id = #{accessWorkId} AND casc.id IS NULL;