From 7d44d7a2a9ee8f55e911d678d78ff25f047cab4d Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 24 Jun 2024 12:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
index ba351b3..d6f0876 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
@@ -206,9 +206,15 @@
left join YWXT.blade_dept bd on locate(bd.id,bu.dept_id)>0 and bd.is_deleted = 0
left join YWXT.blade_role br on locate(br.id,bu.role_id)>0 and br.is_deleted = 0
where bu.is_deleted = 0
- and br.role_alias = #{roleAlias}
+ <if test="roleAlias != null and roleAlias == 'qxglywuser'">
+ and (br.role_alias = #{roleAlias} or br.role_alias = 'qxswjgly')
+ </if>
+ <if test="roleAlias != null and roleAlias == 'sdglywuser'">
+ and (br.role_alias = #{roleAlias} or br.role_alias = 'dsswjgly')
+ </if>
and bd.ad_code = #{adCode}
- limit 3
+ and bu.TYPE is null order by role_name desc,name asc
+ limit 1
</select>
<select id="getPatrolResponsiblePersonByResCdList"
resultType="cn.gistack.sm.sjztmd.entity.PatrolResponsiblePerson">
--
Gitblit v1.9.3