解决信息通知统计已上传附件部门名称重复的问题

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}")

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 )