From 72816f87c67a068dd4b08ce720687ad79434f3fa Mon Sep 17 00:00:00 2001
From: liukewei <huamar123>
Date: Fri, 22 Dec 2023 17:16:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BF=A1=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E7=BB=9F=E8=AE=A1=E5=B7=B2=E4=B8=8A=E4=BC=A0=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/ehs/EhsNoticeMessageFileController.java   | 5 +++--
 .../src/main/resources/mapper/ehs/EhsNoticeMessageMapper.xml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsNoticeMessageFileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsNoticeMessageFileController.java
index 7e3ec77..afa54c3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsNoticeMessageFileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsNoticeMessageFileController.java
@@ -144,6 +144,7 @@ public class EhsNoticeMessageFileController extends BaseController
 			cidsTemp[j]=bas.getDeptId();
 			j++;
 		}
+		ehsNoticeMessageFile.setState(1);
 		List<EhsNoticeMessageFile> fileList = ehsNoticeMessageFileService.selectEhsNoticeMessageFileList(ehsNoticeMessageFile);
 		// fileList里面有deptId,但没有deptName,这里给他设置把，以后再说循环查库的问题
 		String cids=",";
@@ -156,13 +157,13 @@ public class EhsNoticeMessageFileController extends BaseController
 
 		}
 		//String[] cc = ehsNoticeMessageFile.getCompaynList().split(",");
-		for(int i=0;i<cidsTemp.length;i++){
+		/*for(int i=0;i<cidsTemp.length;i++){
 			if(cids.indexOf(cidsTemp[i].toString())==-1){
 				EhsNoticeMessageFile emFile = new EhsNoticeMessageFile();
 				emFile.setDeptName(comMap.get(cidsTemp[i]));
 				fileList.add(emFile);
 			}
-		}
+		}*/
 		return getDataTable(fileList);
 	}
 	@GetMapping("/downloadlist/{id}")
diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsNoticeMessageMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsNoticeMessageMapper.xml
index dda715e..6f3cf07 100644
--- a/ruoyi-system/src/main/resources/mapper/ehs/EhsNoticeMessageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsNoticeMessageMapper.xml
@@ -67,7 +67,7 @@
         SELECT        m.notice_message_id,        m.create_user_id,        m.create_time,        m.dept_id,
         m.title,        m.display_content,        m.STATUS,        m.dept_list,        GROUP_CONCAT( ft.dept_name SEPARATOR ';' ) dept_name,
         m.mesg_type,        m.read_dept_id,        m.all_dept,m.file_temp_name,m.file_temp_original_name,     m.remark,
-        ( SELECT count( 1 ) FROM ehs_notice_message_file f WHERE f.notice_message_id = m.notice_message_id ) file_count
+        ( SELECT count( 1 ) FROM ehs_notice_message_file f WHERE f.notice_message_id = m.notice_message_id  and f.state=1 ) file_count
         FROM        ehs_notice_message m
         LEFT JOIN sys_user e ON e.user_id = m.CREATE_USER_ID
         LEFT JOIN sys_dept ft ON FIND_IN_SET( ft.DEPT_ID, m.dept_list )