From 7918c0611f1cdf1cad82250225307e5185abac4c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 27 十月 2023 10:37:49 +0800
Subject: [PATCH] bug修改：148（历史数据导入报错，当前分类没有设置编码规则，未找父级的编码规则的bug）；150（主数据新增时未先找当前层级的编码规则，再向上查找的bug）

---
 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java
index 7e8788c..287785f 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java
@@ -121,7 +121,7 @@
 	@Override
 	public R checkOrInsert(DictBiz dictBiz) {
 
-		LambdaQueryWrapper<DictBiz> lqw = Wrappers.<DictBiz>query().lambda().eq(DictBiz::getCode, dictBiz.getCode()).eq(DictBiz::getDictKey, dictBiz.getDictKey());
+		LambdaQueryWrapper<DictBiz> lqw = Wrappers.<DictBiz>query().lambda().eq(DictBiz::getCode, dictBiz.getCode()).eq(DictBiz::getDictKey, dictBiz.getDictKey()).eq(DictBiz::getDictValue, dictBiz.getDictValue());
 		Long cnt = baseMapper.selectCount((Func.isEmpty(dictBiz.getId())) ? lqw : lqw.notIn(DictBiz::getId, dictBiz.getId()));
 		if (cnt > 0L) {
 			return R.fail("瀛楀吀宸茬粡瀛樺湪锛�");

--
Gitblit v1.10.0