From bc263d8bed5d1405f275bb8638a9bec9eaf06585 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 31 三月 2025 09:42:00 +0800
Subject: [PATCH] 添加审签逻辑，移动flow通用代码，添加根据角色查询用户，新增时间工具类，修改指派设备bug
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PermissionStreamNewMapper.xml | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 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 7511418..e7552dc 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
@@ -5,7 +5,7 @@
SELECT DISTINCT
mix.id,
mix.tree_code 'code',
- mix.name,
+ mix.tree_name 'name',
mix.parent_id,
mix.tree_type AS 'type',
mix.extend,
@@ -30,21 +30,18 @@
order by mix.tree_type, mix.create_time asc
</select>
<select id="loadProductMixAll" resultType="org.jeecg.modules.dnc.entity.ProductMix">
- SELECT DISTINCT
- mix.id,
- mix.tree_code 'code',
- mix.name,
- mix.parent_id,
- mix.tree_type AS 'type',
- 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
+ SELECT DISTINCT mix.id,
+ mix.tree_code 'code',
+ mix.tree_name 'name',
+ mix.parent_id,
+ mix.tree_type AS 'type',
+ 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
order by mix.tree_type, mix.create_time asc
</select>
</mapper>
--
Gitblit v1.9.3