From 607ebaf27b44e0d27925715e4c2d7e2ffff257f0 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 11 七月 2023 09:49:33 +0800
Subject: [PATCH] 前端代码打包
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index 10740cd..719087b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -36,7 +36,7 @@
import com.vci.ubcs.starter.web.util.VciDateUtil;
import com.vci.ubcs.system.entity.DictBiz;
import com.vci.ubcs.system.feign.IDictBizClient;
-import com.vci.ubcs.core.log.exception.ServiceException;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -460,8 +460,8 @@
for (String s : prefix) {
DictBiz dictBiz = new DictBiz();
dictBiz.setCode(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR);
- dictBiz.setDictKey(s);
- dictBiz.setDictValue("prefix");
+ dictBiz.setDictKey("prefix");
+ dictBiz.setDictValue(s);
iDictBizClient.getCheck(dictBiz) ;
}
// .saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"prefix",prefix,sessionInfo);
@@ -470,8 +470,8 @@
for (String s : suffix) {
DictBiz dictBiz = new DictBiz();
dictBiz.setCode(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR);
- dictBiz.setDictKey(s);
- dictBiz.setDictValue("suffix");
+ dictBiz.setDictKey("suffix");
+ dictBiz.setDictValue(s);
iDictBizClient.getCheck(dictBiz) ;
}
// charService.saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"suffix",suffix,sessionInfo);
@@ -480,8 +480,8 @@
for (String s : dateFormates) {
DictBiz dictBiz = new DictBiz();
dictBiz.setCode(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR);
- dictBiz.setDictKey(s);
- dictBiz.setDictValue("dateFormates");
+ dictBiz.setDictKey("dateFormates");
+ dictBiz.setDictValue(s);
iDictBizClient.getCheck(dictBiz) ;
}
// charService.saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"dateFormates",dateFormates,sessionInfo);
@@ -724,16 +724,16 @@
condition.put("CLASSIFYTEMPLATEOID",templateAttrOid);
List<CodeClassifyTemplateAttr> codeClassifyTemplateAttrDOList = baseMapper.selectByMap(condition);
- List<String> btmOids = new ArrayList<String>();
+ List<String> btmIds = new ArrayList<String>();
for (CodeClassifyTemplateAttr codeClassifyTemplateAttrDO:codeClassifyTemplateAttrDOList){
- btmOids.add(codeClassifyTemplateAttrDO.getId());
+ btmIds.add(codeClassifyTemplateAttrDO.getId());
}
//杩囨护鎺夊凡缁忓瓨鍦ㄧ殑灞炴��
List<BtmTypeAttributeVO> boAttrss = new ArrayList<BtmTypeAttributeVO>();
for (BtmTypeAttributeVO osBtmTypeAttributeVO:btmTypeVOR.getData().getAttributes()){
- if(!btmOids.contains(osBtmTypeAttributeVO.getId())){
+ if(!btmIds.contains(osBtmTypeAttributeVO.getId())){
//鐪嬬湅鏄笉鏄湁妯＄硦鏌ヨ
boolean inSearch = true;
if(StringUtils.isNotBlank(name) && !osBtmTypeAttributeVO.getName().contains(name.replace("*",""))){
--
Gitblit v1.9.3