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 3c3d552..7e3ec77 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
@@ -145,9 +145,15 @@ public class EhsNoticeMessageFileController extends BaseController
 			j++;
 		}
 		List<EhsNoticeMessageFile> fileList = ehsNoticeMessageFileService.selectEhsNoticeMessageFileList(ehsNoticeMessageFile);
+		// fileList里面有deptId,但没有deptName,这里给他设置把，以后再说循环查库的问题
 		String cids=",";
 		for(EhsNoticeMessageFile efile:fileList){
 			cids= efile.getDeptId()+",";
+			// 避免循环查数据库库
+			efile.setDeptName(comMap.get(efile.getDeptId()));
+			//SysDept sysDept = deptService.selectDeptById(efile.getDeptId());
+			//efile.setDeptName(sysDept.getDeptName());
+
 		}
 		//String[] cc = ehsNoticeMessageFile.getCompaynList().split(",");
 		for(int i=0;i<cidsTemp.length;i++){
diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsNoticeMessageMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsNoticeMessageMapper.xml
index 3d8f33c..dda715e 100644
--- a/ruoyi-system/src/main/resources/mapper/ehs/EhsNoticeMessageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsNoticeMessageMapper.xml
@@ -66,7 +66,7 @@
     <select id="selectEhsNoticeMessageListAdmin" parameterType="EhsNoticeMessage" resultMap="EhsNoticeMessageResult">
         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.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
         FROM        ehs_notice_message m
         LEFT JOIN sys_user e ON e.user_id = m.CREATE_USER_ID