From 6ca4dcf73b6fd1ac42c77c75c8ce422a75b75a19 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 07 三月 2024 09:59:54 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 e725d4a..1d48f94 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
@@ -21,7 +21,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.common.constant.CommonConstant;
-import com.vci.ubcs.core.log.exception.ServiceException;
+import org.springblade.core.log.exception.ServiceException;
import com.vci.ubcs.system.cache.DictBizCache;
import com.vci.ubcs.system.entity.DictBiz;
import com.vci.ubcs.system.mapper.DictBizMapper;
@@ -120,16 +120,27 @@
@Override
public R checkOrInsert(DictBiz dictBiz) {
-
- LambdaQueryWrapper<DictBiz> lqw = Wrappers.<DictBiz>query().lambda().eq(DictBiz::getCode, dictBiz.getCode()).eq(DictBiz::getDictKey, dictBiz.getDictKey());
- Long cnt = baseMapper.selectCount((Func.isEmpty(dictBiz.getId())) ? lqw : lqw.notIn(DictBiz::getId, dictBiz.getId()));
+ LambdaQueryWrapper<DictBiz> wrapper = 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()));
+ Long cnt = baseMapper.selectCount(wrapper);
if (cnt > 0L) {
return R.fail("瀛楀吀宸茬粡瀛樺湪锛�");
}
-
+ // 鏍规嵁code鍏堟煡璇㈡槸鍚﹀凡瀛樺湪璇ュ瓧鍏革紝瀛樺湪灏遍渶瑕佸皢褰撳墠瀛楀吀娣诲姞鍒拌code涓嬮潰
+ LambdaQueryWrapper<DictBiz> wrappers = Wrappers.<DictBiz>query()
+ .lambda().eq(DictBiz::getCode, dictBiz.getCode())
+ .eq(DictBiz::getParentId,BladeConstant.TOP_PARENT_ID)
+ .last("limit 1");
+ DictBiz dbDictBiz = baseMapper.selectOne(wrappers);
+ // 褰撳墠code宸插瓨鍦�,浣滀负褰撳墠鐖跺瓧鍏�
+ if(Func.isNotEmpty(dbDictBiz)){
+ dictBiz.setParentId(dbDictBiz.getId());
+ }
+ // 鏄惁涓洪《灞傚瓧鍏�
if (Func.isEmpty(dictBiz.getParentId())) {
dictBiz.setParentId(BladeConstant.TOP_PARENT_ID);
}
+ dictBiz.setIsSealed(0);
dictBiz.setIsDeleted(BladeConstant.DB_NOT_DELETED);
CacheUtil.clear(DICT_CACHE);
@@ -137,6 +148,6 @@
return R.success("鎿嶄綔鎴愬姛!");
}
return R.fail("鎿嶄綔澶辫触锛�");
-
}
+
}
--
Gitblit v1.9.3