From 8cdc917cd8727ed16e21258f51c0ef4cca51c113 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 10 七月 2023 11:02:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java | 8 ++++----
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java
index 94a54f1..1c3bdd4 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java
@@ -413,10 +413,10 @@
if(StringUtils.isBlank(templateOid)){
return new ArrayList<>();
}
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("classifyTemplateOid",templateOid);
- PageHelper pageHelper = new PageHelper(-1);
- pageHelper.addDefaultAsc("orderNum");
+// Map<String,String> conditionMap = new HashMap<>();
+// conditionMap.put("classifyTemplateOid",templateOid);
+// PageHelper pageHelper = new PageHelper(-1);
+// pageHelper.addDefaultAsc("orderNum");
QueryWrapper<CodeClassifyTemplateButton> wrapper = new QueryWrapper<>();
wrapper.eq("classifyTemplateOid",templateOid);
wrapper.orderByAsc("orderNum");
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
index c4d87b5..2d6770b 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
@@ -478,7 +478,7 @@
<select id="selectMenuChildByBtnType" resultMap="menuResultMap">
select pm.*
from pl_sys_menu ps, pl_sys_menu pm
- where ps.is_deleted = 0
+ where pm.is_deleted = 0
and ps.category = 1
and ps.alias = #{btmType}
and ps.id = pm.parent_id order by pm.sort asc
--
Gitblit v1.9.3