From 09fff7d4449fe9fe9e8cd1ffca560ff57e22ed5a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 06 六月 2023 17:52:34 +0800
Subject: [PATCH] 解决代码冲突
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 64c3a30..7f6b022 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
@@ -24,9 +24,9 @@
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.PatternUtil;
+import com.vci.ubcs.starter.util.UBCSCondition;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.*;
-import com.vci.ubcs.starter.util.Map2MPJLambdaUtil;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
@@ -135,7 +135,7 @@
if(conditionMap == null){
conditionMap = new HashMap<String, String>();
}
- return gridCodeClassifyTemplateAttr(Map2MPJLambdaUtil.getMPJLambdaWrapperByMapString(conditionMap, CodeClassifyTemplateAttr.class),pageHelper);
+ return gridCodeClassifyTemplateAttr(UBCSCondition.getMPJLambdaWrapperByMapString(conditionMap, CodeClassifyTemplateAttr.class),pageHelper);
}
@Override
@@ -160,7 +160,11 @@
// conditionMap.put("classifytemplateoid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(templateOids.toArray(new String[0])) + ")");
// PageHelper pageHelper = new PageHelper(-1);
// pageHelper.addDefaultAsc("orderNum");
- List<CodeClassifyTemplateAttr> attrDOS = baseMapper.selectByClassifytemplateoid(VciBaseUtil.toInSql(templateOids.toArray(new String[0])));
+ QueryWrapper<CodeClassifyTemplateAttr> wrapper = new QueryWrapper<>();
+ wrapper.in("classifytemplateoid",templateOids);
+ wrapper.orderByAsc("orderNum");
+ List<CodeClassifyTemplateAttr> attrDOS = baseMapper.selectList(wrapper);
+// baseMapper.selectByClassifytemplateoid(VciBaseUtil.toInSql(templateOids.toArray(new String[0])));
if(!CollectionUtils.isEmpty(attrDOS)){
attrDOList.addAll(attrDOS);
--
Gitblit v1.9.3