From d7e7f32d8c455bd64c0b7ba7f011d5798a291832 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Fri, 7 Jun 2024 09:28:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E9=97=AE=E5=8D=B7=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operationInfo/OperationInfoMapper.java    |   4 +-
 .../questioninfo/QuestionInfoMapper.java      |   1 +
 .../mapper/scriptInfo/ScriptInfoMapper.java   |   2 +-
 .../impl/DepartmentServiceImpl.java           |  17 ++-
 .../impl/OperationInfoServiceImpl.java        |   4 +-
 .../impl/QuestionInfoServiceImpl.java         |   3 +-
 .../impl/ScriptInfoServiceImpl.java           |   2 +
 .../impl/WechatTemplateServiceImpl.java       |   2 +
 .../manage/department/DepartmentMapper.xml    |  10 ++
 .../operationInfo/OperationInfoMapper.xml     |  56 ++++++++--
 .../questioninfo/QuestionInfoMapper.xml       |  67 ++++++++++-
 .../manage/scriptInfo/ScriptInfoMapper.xml    | 104 +++++++++---------
 .../wechattemplate/WechatTemplateMapper.xml   |   3 +
 13 files changed, 205 insertions(+), 70 deletions(-)

diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/operationInfo/OperationInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/operationInfo/OperationInfoMapper.java
index acb1a27e..c09cf31d 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/operationInfo/OperationInfoMapper.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/operationInfo/OperationInfoMapper.java
@@ -26,7 +26,9 @@ public interface OperationInfoMapper {
      * @param operationInfo 手术信息
      * @return 手术信息集合
      */
-    public List<OperationInfo> selectOperationInfoList(OperationInfo operationInfo);
+    List<OperationInfo> selectOperationInfoList(OperationInfo operationInfo);
+
+    List<OperationInfo> selectOperationList(OperationInfo operationInfo);
 
     /**
      * 新增手术信息
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/questioninfo/QuestionInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/questioninfo/QuestionInfoMapper.java
index d78c5e94..06a22ef1 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/questioninfo/QuestionInfoMapper.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/questioninfo/QuestionInfoMapper.java
@@ -29,6 +29,7 @@ public interface QuestionInfoMapper {
      */
     List<QuestionInfo> selectQuestionInfoList(QuestionInfo questionInfo);
 
+    List<QuestionInfo> selectQuestionList(QuestionInfo questionInfo);
     /**
      * 新增问卷基本信息
      *
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java
index 198b8d3d..a6a5d6a1 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java
@@ -26,7 +26,7 @@ public interface ScriptInfoMapper {
      * @param scriptInfo 话术信息
      * @return 话术信息集合
      */
-    public List<ScriptInfo> selectScriptInfoList(ScriptInfo scriptInfo);
+     List<ScriptInfo> selectScriptInfoList(ScriptInfo scriptInfo);
 
     /**
      * 新增话术信息
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java
index 8c0195b9..c5c3067e 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java
@@ -1,5 +1,6 @@
 package com.xinelu.manage.service.department.impl;
 
+import com.xinelu.common.annotation.DataScope;
 import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.core.domain.entity.SysUser;
 import com.xinelu.common.exception.ServiceException;
@@ -15,16 +16,17 @@ import com.xinelu.manage.service.department.IDepartmentService;
 import com.xinelu.manage.vo.department.DepartmentListVO;
 import com.xinelu.manage.vo.department.DepartmentVO;
 import com.xinelu.system.mapper.SysUserMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import javax.annotation.Resource;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.BooleanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -162,6 +164,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
      * @param departmentDto 科室信息
      * @return 结果
      */
+    @DataScope(agencyAlias = "d", deptAlias = "si")
     @Override
     public List<DepartmentVO> selectDepartmentListScriptNum(DepartmentDTO departmentDto) {
         return departmentMapper.selectDepartmentListScriptNum(departmentDto);
@@ -173,6 +176,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
      * @param departmentDto 科室信息
      * @return 结果
      */
+    @DataScope(agencyAlias = "d", deptAlias = "oi")
     @Override
     public List<DepartmentVO> selectDepartmentListOperationNum(DepartmentDTO departmentDto) {
         return departmentMapper.selectDepartmentListOperationNum(departmentDto);
@@ -184,6 +188,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
      * @param departmentDto 科室信息
      * @return 结果
      */
+    @DataScope(agencyAlias = "d", deptAlias = "wt")
     @Override
     public List<DepartmentVO> selectDepartmentListWechatTemplateNum(DepartmentDTO departmentDto) {
         return departmentMapper.selectDepartmentListWechatTemplateNum(departmentDto);
@@ -195,6 +200,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
      * @param departmentDto 科室信息
      * @return 结果
      */
+    @DataScope(agencyAlias = "d", deptAlias = "tm")
     @Override
     public List<DepartmentVO> selectDepartmentListMessageNum(DepartmentDTO departmentDto) {
         return departmentMapper.selectDepartmentListMessageNum(departmentDto);
@@ -253,6 +259,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
      * @param departmentDto 科室
      * @return 结果
      */
+    @DataScope(agencyAlias = "d", deptAlias = "sp")
     @Override
     public List<DepartmentVO> selectListServicePackageNum(DepartmentDTO departmentDto) {
         return departmentMapper.selectListServicePackageNum(departmentDto);
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/operationInfo/impl/OperationInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/operationInfo/impl/OperationInfoServiceImpl.java
index 6e0ee4bc..77f8c592 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/operationInfo/impl/OperationInfoServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/operationInfo/impl/OperationInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package com.xinelu.manage.service.operationInfo.impl;
 
+import com.xinelu.common.annotation.DataScope;
 import com.xinelu.common.constant.Constants;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.SecurityUtils;
@@ -45,9 +46,10 @@ public class OperationInfoServiceImpl implements IOperationInfoService {
      * @param operationInfo 手术信息
      * @return 手术信息
      */
+    @DataScope(agencyAlias = "d", deptAlias = "oi")
     @Override
     public List<OperationInfo> selectOperationInfoList(OperationInfo operationInfo) {
-        return operationInfoMapper.selectOperationInfoList(operationInfo);
+        return operationInfoMapper.selectOperationList(operationInfo);
     }
 
     /**
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java
index 2807adf1..9beaea27 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java
@@ -82,9 +82,10 @@ public class QuestionInfoServiceImpl implements IQuestionInfoService {
      * @param questionInfo 问卷基本信息
      * @return 问卷基本信息
      */
+    @DataScope(agencyAlias = "dt", deptAlias = "qi")
     @Override
     public List<QuestionInfo> selectQuestionInfoList(QuestionInfo questionInfo) {
-        return questionInfoMapper.selectQuestionInfoList(questionInfo);
+        return questionInfoMapper.selectQuestionList(questionInfo);
     }
 
     /**
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java
index 1dfed335..24e0378b 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package com.xinelu.manage.service.scriptInfo.impl;
 
+import com.xinelu.common.annotation.DataScope;
 import com.xinelu.common.config.SystemBusinessConfig;
 import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.exception.ServiceException;
@@ -51,6 +52,7 @@ public class ScriptInfoServiceImpl implements IScriptInfoService {
      * @param scriptInfo 话术信息
      * @return 话术信息
      */
+    @DataScope(agencyAlias = "d", deptAlias = "si")
     @Override
     public List<ScriptInfo> selectScriptInfoList(ScriptInfo scriptInfo) {
         return scriptInfoMapper.selectScriptInfoList(scriptInfo);
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java
index 83a81629..ddb2cb52 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java
@@ -1,5 +1,6 @@
 package com.xinelu.manage.service.wechattemplate.impl;
 
+import com.xinelu.common.annotation.DataScope;
 import com.xinelu.common.core.domain.entity.SysDictData;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.SecurityUtils;
@@ -54,6 +55,7 @@ public class WechatTemplateServiceImpl implements IWechatTemplateService {
      * @param wechatTemplateDto 微信模板信息
      * @return 微信模板信息
      */
+    @DataScope(agencyAlias = "d", deptAlias = "wt")
     @Override
     public List<WechatTemplateTaskVO> selectWechatTemplateList(WechatTemplateDTO wechatTemplateDto) {
         // 查询微信模板信息列表
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml
index 69961f87..babb5c76 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml
@@ -180,6 +180,8 @@
             <if test="scriptStatus != null  and scriptStatus != ''">
                 and si.script_status = #{scriptStatus}
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         GROUP BY d.id,
         d.department_name,
@@ -203,6 +205,8 @@
                 '%'
                 )
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         GROUP BY d.id,
         d.department_name,
@@ -225,6 +229,8 @@
             <if test="templateSource != null  and templateSource != ''">
                 and wt.template_source =#{templateSource}
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         GROUP BY d.id,
         d.department_name,
@@ -246,6 +252,8 @@
             <if test="textMessageStatus != null  and textMessageStatus != ''">
                 and tm.text_message_status = #{textMessageStatus}
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         GROUP BY d.id,
         d.department_name,
@@ -299,6 +307,8 @@
             <if test="departmentName != null  and departmentName != ''">
                 and d.department_name like concat('%',#{departmentName},'%')
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         GROUP BY d.id,
         d.department_name,
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/operationInfo/OperationInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/operationInfo/OperationInfoMapper.xml
index 647b9b9e..aa77b5e0 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/operationInfo/OperationInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/operationInfo/OperationInfoMapper.xml
@@ -55,25 +55,65 @@
                 )
             </if>
             <if test="operationCode != null  and operationCode != ''">
-                and operation_code =
-                #{operationCode}
+                and operation_code = #{operationCode}
             </if>
             <if test="operationInfo != null  and operationInfo != ''">
-                and operation_info =
-                #{operationInfo}
+                and operation_info = #{operationInfo}
             </if>
             <if test="operationRemark != null  and operationRemark != ''">
-                and operation_remark =
-                #{operationRemark}
+                and operation_remark = #{operationRemark}
             </if>
             <if test="sort != null ">
-                and sort =
-                #{sort}
+                and sort = #{sort}
             </if>
         </where>
         order by create_time DESC
     </select>
 
+    <select id="selectOperationList" parameterType="OperationInfo" resultMap="OperationInfoResult">
+        select oi.id,
+        oi.department_id,
+        oi.department_name,
+        oi.operation_name,
+        oi.operation_code,
+        oi.operation_info,
+        oi.operation_remark,
+        oi.sort,
+        oi.create_by,
+        oi.create_time,
+        oi.update_by,
+        oi.update_time
+        from operation_info oi
+        left join department d on d.id = oi.department_id
+        <where>
+            <if test="departmentId != null ">
+                and oi.department_id = #{departmentId}
+            </if>
+            <if test="departmentName != null  and departmentName != ''">
+                and oi.department_name like concat('%',#{departmentName},'%')
+            </if>
+            <if test="operationName != null  and operationName != ''">
+                and oi.operation_name like concat('%',#{operationName},'%')
+            </if>
+            <if test="operationCode != null  and operationCode != ''">
+                and oi.operation_code = #{operationCode}
+            </if>
+            <if test="operationInfo != null  and operationInfo != ''">
+                and oi.operation_info = #{operationInfo}
+            </if>
+            <if test="operationRemark != null  and operationRemark != ''">
+                and oi.operation_remark = #{operationRemark}
+            </if>
+            <if test="sort != null ">
+                and oi.sort = #{sort}
+            </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
+        order by create_time DESC
+    </select>
+
+
     <select id="selectOperationInfoById" parameterType="Long"
             resultMap="OperationInfoResult">
         <include refid="selectOperationInfoVo"/>
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/questioninfo/QuestionInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/questioninfo/QuestionInfoMapper.xml
index 83685db1..932b77a1 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/questioninfo/QuestionInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/questioninfo/QuestionInfoMapper.xml
@@ -97,6 +97,70 @@
         </where>
     </select>
 
+    <select id="selectQuestionList" parameterType="QuestionInfo" resultMap="QuestionInfoResult">
+        select qi.id,
+        qi.department_id,
+        qi.department_name,
+        qi.disease_type_id,
+        qi.disease_type_name,
+        qi.questionnaire_name,
+        qi.questionnaire_description,
+        qi.answering_method,
+        qi.questionnaire_id,
+        qi.question_count,
+        qi.questionnaire_total_score,
+        qi.questionnaire_status,
+        qi.questionnaire_sort,
+        qi.questionnaire_remark,
+        qi.question_type,
+        qi.create_by,
+        qi.create_time,
+        qi.update_by,
+        qi.update_time
+        from question_info qi
+        left join department dt ON qi.department_id = dt.id
+        <where>
+            <if test="departmentId != null ">
+                and qi.department_id = #{departmentId}
+            </if>
+            <if test="departmentName != null  and departmentName != ''">
+                and qi.department_name like concat('%', #{departmentName}, '%')
+            </if>
+            <if test="diseaseTypeId != null ">
+                and qi.disease_type_id = #{diseaseTypeId}
+            </if>
+            <if test="diseaseTypeName != null  and diseaseTypeName != ''">
+                and qi.disease_type_name like concat('%', #{diseaseTypeName}, '%')
+            </if>
+            <if test="questionnaireName != null  and questionnaireName != ''">
+                and qi.questionnaire_name like concat('%', #{questionnaireName}, '%')
+            </if>
+            <if test="questionnaireDescription != null  and questionnaireDescription != ''">
+                and qi.questionnaire_description = #{questionnaireDescription}
+            </if>
+            <if test="answeringMethod != null  and answeringMethod != ''">
+                and qi.answering_method = #{answeringMethod}
+            </if>
+            <if test="questionnaireId != null  and questionnaireId != ''">
+                and qi.questionnaire_id = #{questionnaireId}
+            </if>
+            <if test="questionCount != null ">
+                and qi.question_count = #{questionCount}
+            </if>
+            <if test="questionnaireTotalScore != null ">
+                and qi.questionnaire_total_score = #{questionnaireTotalScore}
+            </if>
+            <if test="questionnaireStatus != null  and questionnaireStatus != ''">
+                and qi.questionnaire_status = #{questionnaireStatus}
+            </if>
+            <if test="questionType != null  and questionType != ''">
+                and qi.question_type = #{questionType}
+            </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
+    </select>
+
     <select id="selectQuestionInfoById" parameterType="Long"
             resultMap="QuestionInfoResult">
         <include refid="selectQuestionInfoVo"/>
@@ -263,7 +327,8 @@
         dt.department_name,
         dt.department_code,
         count(qi.id) AS countNum,
-        (select count(1) from question_info) totalNumber
+        (select count(1) from question_info qi left join department dt on dt.id = qi.department_id <where>
+        ${params.dataScope}</where>) totalNumber
         from department dt left join question_info qi on dt.id = qi.department_id
         <where>
             <if test="departmentName != null  and departmentName != ''">
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml
index 781aa722..db5befcb 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml
@@ -48,70 +48,70 @@
     </sql>
 
     <select id="selectScriptInfoList" parameterType="ScriptInfo" resultMap="ScriptInfoResult">
-        <include refid="selectScriptInfoVo"/>
+        select si.id,
+        si.department_id,
+        si.department_name,
+        si.disease_type_id,
+        si.disease_type_name,
+        si.common_script_name,
+        si.script_name,
+        si.script_id,
+        si.platform_id,
+        si.script_status,
+        si.script_introduction,
+        si.script_sort,
+        si.script_remark,
+        si.script_file_path,
+        si.create_by,
+        si.create_time,
+        si.update_by,
+        si.update_time
+        from script_info si
+        left join department d on d.id = si.department_id
         <where>
             <if test="departmentId != null ">
-                and department_id =
-                #{departmentId}
+                and si.department_id =#{departmentId}
             </if>
             <if test="departmentName != null  and departmentName != ''">
-                and department_name like concat('%',
-                #{departmentName},
-                '%'
-                )
+                and si.department_name like concat('%',#{departmentName}, '%' )
             </if>
             <if test="diseaseTypeId != null ">
-                and disease_type_id =
-                #{diseaseTypeId}
+                and si.disease_type_id =#{diseaseTypeId}
             </if>
             <if test="diseaseTypeName != null  and diseaseTypeName != ''">
-                and disease_type_name like concat('%',
-                #{diseaseTypeName},
-                '%'
-                )
+                and si.disease_type_name like concat('%', #{diseaseTypeName},'%')
             </if>
             <if test="commonScriptName != null  and commonScriptName != ''">
-                and common_script_name like concat('%',
-                #{commonScriptName},
-                '%'
-                )
+                and si.common_script_name like concat('%',#{commonScriptName},'%' )
             </if>
             <if test="scriptName != null  and scriptName != ''">
-                and script_name like concat('%',
-                #{scriptName},
-                '%'
-                )
+                and si.script_name like concat('%', #{scriptName},'%' )
             </if>
             <if test="scriptId != null  and scriptId != ''">
-                and script_id =
-                #{scriptId}
+                and si.script_id =#{scriptId}
             </if>
             <if test="platformId != null  and platformId != ''">
-                and platform_id =
-                #{platformId}
+                and si.platform_id =#{platformId}
             </if>
             <if test="scriptStatus != null  and scriptStatus != ''">
-                and script_status =
-                #{scriptStatus}
+                and si.script_status =#{scriptStatus}
             </if>
             <if test="scriptIntroduction != null  and scriptIntroduction != ''">
-                and script_introduction =
-                #{scriptIntroduction}
+                and si.script_introduction =#{scriptIntroduction}
             </if>
             <if test="scriptSort != null ">
-                and script_sort =
-                #{scriptSort}
+                and si.script_sort =#{scriptSort}
             </if>
             <if test="scriptRemark != null  and scriptRemark != ''">
-                and script_remark =
-                #{scriptRemark}
+                and si.script_remark =#{scriptRemark}
             </if>
             <if test="scriptFilePath != null  and scriptFilePath != ''">
-                and script_file_path =
-                #{scriptFilePath}
+                and si.script_file_path =#{scriptFilePath}
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
-        order by create_time DESC
+        order by si.create_time DESC
     </select>
 
     <select id="selectScriptInfoById" parameterType="Long"
@@ -219,51 +219,51 @@
         update script_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="departmentId != null">department_id =
-            #{departmentId},
+                #{departmentId},
             </if>
             <if test="departmentName != null">department_name =
-            #{departmentName},
+                #{departmentName},
             </if>
             disease_type_id = #{diseaseTypeId},
             disease_type_name = #{diseaseTypeName},
             <if test="commonScriptName != null">common_script_name =
-            #{commonScriptName},
+                #{commonScriptName},
             </if>
             <if test="scriptName != null">script_name =
-            #{scriptName},
+                #{scriptName},
             </if>
             <if test="scriptId != null">script_id =
-            #{scriptId},
+                #{scriptId},
             </if>
             <if test="platformId != null">platform_id =
-            #{platformId},
+                #{platformId},
             </if>
             <if test="scriptStatus != null">script_status =
-            #{scriptStatus},
+                #{scriptStatus},
             </if>
             <if test="scriptIntroduction != null">script_introduction =
-            #{scriptIntroduction},
+                #{scriptIntroduction},
             </if>
             <if test="scriptSort != null">script_sort =
-            #{scriptSort},
+                #{scriptSort},
             </if>
             <if test="scriptRemark != null">script_remark =
-            #{scriptRemark},
+                #{scriptRemark},
             </if>
-            <if test="scriptFilePath != null"> script_file_path=
-            #{scriptFilePath},
+            <if test="scriptFilePath != null">script_file_path=
+                #{scriptFilePath},
             </if>
             <if test="createBy != null">create_by =
-            #{createBy},
+                #{createBy},
             </if>
             <if test="createTime != null">create_time =
-            #{createTime},
+                #{createTime},
             </if>
             <if test="updateBy != null">update_by =
-            #{updateBy},
+                #{updateBy},
             </if>
             <if test="updateTime != null">update_time =
-            #{updateTime},
+                #{updateTime},
             </if>
         </trim>
         where id = #{id}
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml
index abe848a2..f6897467 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml
@@ -130,6 +130,7 @@
         wtst.suit_task_type_name
         from wechat_template wt
         left join wechat_template_suit_task wtst on wt.id = wtst.wechat_template_id
+        left join department d on d.id = wt.department_id
         <where>
             <if test="departmentId != null ">
                 and wt.department_id =
@@ -151,6 +152,8 @@
                 and wt.template_source =
                 #{templateSource}
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         order by wt.create_time DESC,wtst.create_time DESC
     </select>