From c5c469fafb56ea9c03f25e67e5808d2abc25f699 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 19 三月 2025 13:54:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PermissionStreamNewMapper.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PermissionStreamNewMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PermissionStreamNewMapper.xml
index de844de..7511418 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PermissionStreamNewMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PermissionStreamNewMapper.xml
@@ -8,7 +8,8 @@
mix.name,
mix.parent_id,
mix.tree_type AS 'type',
- mix.extend
+ mix.extend,
+ mix.create_time
FROM
nc_product_mix mix -- 杩炴帴鏉冮檺琛紝绛涢�夐儴闂ㄧ浉鍏宠褰�
LEFT JOIN nc_permission_stream_new nps_depart ON mix.id = nps_depart.business_id
@@ -25,7 +26,8 @@
AND nps_user.delete_flag = '0'
WHERE
nps_depart.business_id IS NOT NULL
- AND nps_user.business_id IS NOT NULL;
+ AND nps_user.business_id IS NOT NULL
+ order by mix.tree_type, mix.create_time asc
</select>
<select id="loadProductMixAll" resultType="org.jeecg.modules.dnc.entity.ProductMix">
SELECT DISTINCT
@@ -34,13 +36,15 @@
mix.name,
mix.parent_id,
mix.tree_type AS 'type',
- mix.extend
+ mix.extend,
+ mix.create_time
FROM
nc_product_mix mix -- 杩炴帴鏉冮檺琛紝绛涢�夐儴闂ㄧ浉鍏宠褰�
LEFT JOIN nc_permission_stream_new nps_user ON mix.id = nps_user.business_id
AND nps_user.user_id = #{userId}
AND nps_user.delete_flag = '0'
WHERE
- nps_user.business_id IS NOT NULL;
+ nps_user.business_id IS NOT NULL
+ order by mix.tree_type, mix.create_time asc
</select>
</mapper>
--
Gitblit v1.9.3