From 1f12e84942f960d100045d651cbf687eea37e04f Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 19 Jul 2024 09:21:40 +0800
Subject: [PATCH] 7/19

---
 .../biz/supplierinfo/SupplierInfoService.java     | 15 +++++++--------
 .../biz/suppliertype/SupplierTypeMapper.java      |  2 +-
 .../biz/suppliertype/SupplierTypeService.java     |  3 +--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoService.java b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoService.java
index 6d24b5d..a394532 100644
--- a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoService.java
+++ b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoService.java
@@ -93,21 +93,21 @@ public class SupplierInfoService extends MybatisBaseService<SupplierInfoMapper,
 			return rb.success().setData(p);
 		}
 		if (StringUtils.isNotBlank(query.getSupplierName())){
-			qw.like("supplierName",query.getSupplierName());
+			qw.like("a.supplierName",query.getSupplierName());
 		}
 		if (StringUtils.isNotBlank(query.getSupplierTypeName())){
-			qw.like("supplierTypeName",query.getSupplierTypeName());
+			qw.like("a.supplierTypeName",query.getSupplierTypeName());
 		}
 		if (StringUtils.isNotBlank(query.getContactTelePhone())){
-			qw.like("contactTelePhone",query.getContactTelePhone());
+			qw.like("a.contactTelePhone",query.getContactTelePhone());
 		}
 		if (StringUtils.isNotBlank(query.getContactName())){
-			qw.like("contactName",query.getContactName());
+			qw.like("a.contactName",query.getContactName());
 		}
 		if (StringUtils.isNotBlank(query.getOtherQuery())){
-			qw.and(wrapper -> wrapper.like("supplierName", query.getOtherQuery()).or().like("supplierPY", query.getOtherQuery()).or().like("contactTelePhone",query.getOtherQuery()));
+			qw.and(wrapper -> wrapper.like("a.supplierName", query.getOtherQuery()).or().like("a.supplierPY", query.getOtherQuery()).or().like("contactTelePhone",query.getOtherQuery()));
 		}
-		qw.eq("isDelete",0);
+		qw.eq("a.isDelete",0);
 		IPage<SupplierInfo> page = PagerUtil.queryToPage(pq);
 		IPage<SupplierInfoVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<SupplierInfoVo> p = PagerUtil.pageToVo(pagging, null);
@@ -151,8 +151,7 @@ public class SupplierInfoService extends MybatisBaseService<SupplierInfoMapper,
 		SupplierInfo entity = new SupplierInfo();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		entity.setCreateBySid(dto.getUserSid());
-		entity.setCreateOrgSid(dto.getOrgPath());
-		entity.setUseOrgSid(dto.getOrgPath());
+		entity.setCreateOrgSid(dto.getUseOrgSid());
 		baseMapper.insert(entity);
 		return entity.getSid();
 	}
diff --git a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java
index 2c2f384..c0c3ef5 100644
--- a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java
+++ b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java
@@ -64,6 +64,6 @@ public interface SupplierTypeMapper extends BaseMapper<SupplierType> {
 	@Select("SELECT COUNT(*) FROM supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND useOrgSid = #{useOrgSid} AND sid != #{dtoSid}")
 	int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid);
 
-	@Select("select * from supplier_type where useOrgSid = #{useOrgSid} and isDelete = '0'")
+	@Select("select * from supplier_type a LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid where s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete = '0'")
 	List<SupplierTypeDown> selSupplierType(String useOrgSid);
 }
\ No newline at end of file
diff --git a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeService.java b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeService.java
index ef8ad5f..b0c2675 100644
--- a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeService.java
+++ b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeService.java
@@ -110,8 +110,7 @@ public class SupplierTypeService extends MybatisBaseService<SupplierTypeMapper,
 		SupplierType entity = new SupplierType();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		entity.setCreateBySid(dto.getUserSid());
-		entity.setCreateOrgSid(dto.getOrgPath());
-		entity.setUseOrgSid(dto.getOrgPath());
+		entity.setCreateOrgSid(dto.getUseOrgSid());
 		baseMapper.insert(entity);
 	}