通知公告查询增加已办类型查看

tianhu-system/src/main/java/com/tianhu/system/controller/OwnNoticeController.java

@@ -1,6 +1,7 @@
 package com.tianhu.system.controller;
 
 import com.keao.tianhu.core.entity.R;
+import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.common.core.web.controller.BaseController;
 import com.tianhu.common.core.web.domain.AjaxResult;
 import com.tianhu.common.core.web.page.TableDataInfo;
@@ -56,6 +57,11 @@ public class OwnNoticeController extends BaseController
         map.put("noticeType",sysNotice.getNoticeType());
         //待办类型
         map.put("workType",sysNotice.getWorkType());
+        if(CommonUtil.isEmpty(sysNotice.getStatus())){
+            map.put("status","0");
+        }else{
+            map.put("status",sysNotice.getStatus());
+        }
         startPage();
         List<Map> list = iOwnNoticeService.selectOwnNoticeList(map);
         return getDataTable(list);

tianhu-system/src/main/resources/mapper/system/OwnNoticeMapper.xml

@@ -20,7 +20,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			sys_notice
 		LEFT JOIN sys_notice_user_rel
 			ON snyr_notice_id = notice_id
-		WHERE STATUS = '0'
+		WHERE 1=1
+		<if test="status != null and status != ''">
+			AND STATUS = #{status}
+		</if>
 		<if test="companyId != null and companyId != ''">
 			AND company_id = #{companyId}
 		</if>