From e610dbf131729194519ae1ebb63f4c4d613c41a0 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Mon, 11 Nov 2024 17:09:33 +0800
Subject: [PATCH] 修改权限逻辑
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
index acdad21..dc29b03 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -108,7 +108,7 @@
<if test="dto.selfUnit != null and dto.selfUnit.size>0">
and
<foreach collection="dto.selfUnit" item="item" index="index" open="(" separator="or" close=")">
- si.CONSTRUCTION_UNIT Like CONCAT(CONCAT('%', #{item}), '%')
+ si.CONSTRUCTION_UNIT Like CONCAT(CONCAT('%', #{item}), '%') or si.SELF_UNIT Like CONCAT(CONCAT('%', #{item}), '%')
</foreach>
</if>
<if test="dto.userUnit != null and dto.userUnit.size>0">
@@ -237,13 +237,14 @@
</if>
</select>
<select id="getUserByIds" resultType="java.util.Map">
- select u.id ,u.real_name ,d.full_name as deptName from ywxt.blade_user u inner join ywxt.blade_dept d on u.dept_id = convert(varchar(100),d.id) where 1 = 1
+ select u.id ,u.real_name ,d.full_name as deptName from ywxt.blade_user u inner join ywxt.blade_dept d on u.dept_id like CONCAT('%', d.id, '%') where 1 = 1 and d."SG_CODE" is not null
<if test="ids != null and ids.size>0">
AND u.id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
+
</select>
<select id="selectProframId" resultType="java.lang.Long">
select program_id from ywxt.sg_device where id = #{deviceId}
--
Gitblit v1.9.3