From 1b0f62e23bc3815d72697183309f4c4611376a6b Mon Sep 17 00:00:00 2001
From: haown <454902499@qq.com>
Date: Wed, 5 Jun 2024 14:03:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A3=E6=95=99=E5=BA=93?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/propagandainfo/PropagandaInfoDto.java |  3 +-
 .../impl/DepartmentServiceImpl.java           | 11 ++---
 .../impl/PropagandaInfoServiceImpl.java       |  3 ++
 .../propagandainfo/PropagandaInfoMapper.xml   | 46 +++++++++++--------
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java
index 03617196..9563a26c 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java
@@ -1,6 +1,7 @@
 package com.xinelu.manage.dto.propagandainfo;
 
 import com.xinelu.common.annotation.Excel;
+import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.time.LocalDate;
@@ -14,7 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  **/
 @ApiModel("宣教库查询传输对象")
 @Data
-public class PropagandaInfoDto {
+public class PropagandaInfoDto extends BaseEntity {
 
 	/** 所属医院id */
 	@ApiModelProperty(value = "所属医院id")
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 d4f7129d..8c0195b9 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
@@ -15,17 +15,16 @@ 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;
 
 
 /**
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java
index 13dd060d..dc60d5a4 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package com.xinelu.manage.service.propagandainfo.impl;
 
+import com.xinelu.common.annotation.DataScope;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.common.utils.bean.BeanUtils;
@@ -79,6 +80,7 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService {
      * @return 宣教库管理
      */
     @Override
+    @DataScope(anencyAlias = "p")
     public List<PropagandaInfo> selectPropagandaInfoList(PropagandaInfoDto propagandaInfo) {
         return propagandaInfoMapper.selectPropagandaInfoList(propagandaInfo);
     }
@@ -215,6 +217,7 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService {
     }
 
     @Override
+    @DataScope(anencyAlias = "d")
     public List<DepartmentVO> selectNumByDept(PropagandaInfoDto propagandaInfoDto) {
         return propagandaInfoMapper.selectNumByDept(propagandaInfoDto);
     }
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml
index ac1fae9e..c0b85b1c 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml
@@ -34,38 +34,42 @@
     </sql>
 
     <select id="selectPropagandaInfoList" parameterType="com.xinelu.manage.dto.propagandainfo.PropagandaInfoDto" resultMap="PropagandaInfoResult">
-        <include refid="selectPropagandaInfoVo"/>
+	    select p.id, p.hospital_agency_id, p.hospital_agency_name, p.department_id, p.department_name, p.propaganda_title, p.propaganda_type, p.propaganda_code, p.propaganda_status,
+	    p.propaganda_content, p.propaganda_cover_path, p.article_summary, p.voicebroadcast, p.disease_type_id, p.disease_type_name,
+	    p.propaganda_link, p.propaganda_barcode_path,p.del_flag, p.create_by, p.create_time, p.update_by, p.update_time from propaganda_info p
         <where>
-	        del_flag = 0
+	        p.del_flag = 0
             <if test="hospitalAgencyId != null ">
-                and hospital_agency_id = #{hospitalAgencyId}
+                and p.hospital_agency_id = #{hospitalAgencyId}
             </if>
             <if test="departmentId != null ">
-                and department_id = #{departmentId}
+                and p.department_id = #{departmentId}
             </if>
             <if test="propagandaTitle != null  and propagandaTitle != ''">
-                and propaganda_title like concat('%', #{propagandaTitle}, '%')
+                and p.propaganda_title like concat('%', #{propagandaTitle}, '%')
             </if>
 	        <if test="propagandaType != null  and propagandaType != ''">
-		        and propaganda_type = #{propagandaType}
+		        and p.propaganda_type = #{propagandaType}
 	        </if>
 	        <if test="propagandaCode != null  and propagandaCode != ''">
-		        and propaganda_code = #{propagandaCode}
+		        and p.propaganda_code = #{propagandaCode}
 	        </if>
             <if test="propagandaStatus != null  and propagandaStatus != ''">
-                and propaganda_status = #{propagandaStatus}
+                and p.propaganda_status = #{propagandaStatus}
             </if>
             <if test="createBy != null and propagandaStatus != ''">
-                and create_by = #{createBy}
+                and p.create_by = #{createBy}
             </if>
 	        <if test="createTimeStart != null">
-		        and date_format(create_time, '%y%m%d') >= date_format(#{createTimeStart}, '%y%m%d')
+		        and date_format(p.create_time, '%y%m%d') >= date_format(#{createTimeStart}, '%y%m%d')
 	        </if>
 	        <if test="createTimeEnd != null">
-		        and date_format(create_time, '%y%m%d') &lt;= date_format(#{createTimeEnd}, '%y%m%d')
+		        and date_format(p.create_time, '%y%m%d') &lt;= date_format(#{createTimeEnd}, '%y%m%d')
 	        </if>
+	        <!-- 数据范围过滤 -->
+	        ${params.dataScope}
         </where>
-        order by create_time desc
+        order by p.create_time desc
     </select>
 
     <select id="selectPropagandaInfoById" parameterType="Long"
@@ -248,18 +252,20 @@
 		d.department_name,
 		count(p.id) AS countNum
 		from department d left join
-		    (select id, department_id, propaganda_status from propaganda_info
-				<where>
-					del_flag = 0
-					<if test="propagandaStatus != null  and propagandaStatus != ''">
-						and propaganda_status = #{propagandaStatus}
-					</if>
-				</where>
-         	) as p on d.id = p.department_id
+		(select id, department_id, propaganda_status from propaganda_info
+		<where>
+			del_flag = 0
+			<if test="propagandaStatus != null  and propagandaStatus != ''">
+				and propaganda_status = #{propagandaStatus}
+			</if>
+		</where>
+		) as p on d.id = p.department_id
 		<where>
 			<if test="departmentName != null  and departmentName != ''">
 				and d.department_name like concat('%', #{departmentName}, '%')
 			</if>
+			<!-- 数据范围过滤 -->
+			${params.dataScope}
 		</where>
 		GROUP BY d.id,
 		d.department_name,