From 138cac5008689fadaa96ecac116a2297bb69bc1c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 04 Mar 2022 10:45:40 +0800
Subject: [PATCH] 1. 电子围栏基本接口新增 2. 保安员证核查申请记录基本接口新增，审批，批量审批接口编写 3. 保安员证档案库新增字段 source 来源，保安员证生成修改
---
src/main/java/org/springblade/modules/talk/mapper/TalkMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/talk/mapper/TalkMapper.xml b/src/main/java/org/springblade/modules/talk/mapper/TalkMapper.xml
index 2be131d..6c4c1b4 100644
--- a/src/main/java/org/springblade/modules/talk/mapper/TalkMapper.xml
+++ b/src/main/java/org/springblade/modules/talk/mapper/TalkMapper.xml
@@ -15,11 +15,17 @@
<result column="imgurl" property="imgurl"/>
</resultMap>
-
+ <!--自定义心理咨询分页查询-->
<select id="selectTalkPage" resultMap="talkResultMap">
- select * from sys_talk where 1=1
- <if test="talk.deptid!=null and alk.deptid!='' and alk.deptid!='1123598813738675201'">
- deptid=#{talk.deptid}
+ select st.* from sys_talk st
+ left join sys_information si on si.departmentid = st.deptid
+ left join sys_jurisdiction sj on si.jurisdiction = sj.id
+ where 1=1
+ <if test="talk.deptid!=null and talk.deptid!='' and talk.deptid!='1123598813738675201'">
+ and st.deptid=#{talk.deptid}
+ </if>
+ <if test="talk.jurisdiction!=null and talk.jurisdiction!='' and talk.jurisdiction!='1372091709474910209'">
+ and (sj.id=#{talk.jurisdiction} or sj.parent_id = #{talk.jurisdiction})
</if>
</select>
--
Gitblit v1.9.3