From 75007678d3d1c03d8a6b99bd84332e7ad91f38fd Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期五, 09 六月 2023 18:32:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 a89d482..f24d9d7 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
@@ -160,10 +160,10 @@
// conditionMap.put("classifytemplateoid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(templateOids.toArray(new String[0])) + ")");
// PageHelper pageHelper = new PageHelper(-1);
// pageHelper.addDefaultAsc("orderNum");
- QueryWrapper<CodeClassifyTemplateAttr> wrapper = new QueryWrapper<>();
- wrapper.in("classifytemplateoid",templateOids);
- wrapper.orderByAsc("orderNum");
- List<CodeClassifyTemplateAttr> attrDOS = baseMapper.selectList(wrapper);
+// QueryWrapper<CodeClassifyTemplateAttr> wrapper = new QueryWrapper<>();
+// wrapper.in("classifytemplateoid",templateOids);
+// wrapper.orderByAsc("orderNum");
+ List<CodeClassifyTemplateAttr> attrDOS = baseMapper.selectByClassifytemplateoidRel(VciBaseUtil.toInSql(templateOids.toArray(new String[0])));
// baseMapper.selectByClassifytemplateoid(VciBaseUtil.toInSql(templateOids.toArray(new String[0])));
if(!CollectionUtils.isEmpty(attrDOS)){
--
Gitblit v1.9.3