首页公告

purchase-common/src/main/java/com/ozs/common/vo/PageVo.java

@@ -7,15 +7,23 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Map;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @ApiModel("分页实体")
 public class PageVo {
-    /** 当前记录起始索引 */
+    /**
+     * 当前记录起始索引
+     */
     @ApiModelProperty("页数")
     private Long pageNum;
-    /** 每页显示记录数 */
+    /**
+     * 每页显示记录数
+     */
     @ApiModelProperty("页大小")
     private Long pageSize;
+
+    private Map<String, Object> params;
 }

purchase-system/src/main/java/com/ozs/base/mapper/BaseNoticeMapper.java

@@ -23,7 +23,7 @@ public interface BaseNoticeMapper extends BaseMapper<BaseNotice> {
             " base_notice b left join pm_audit_dept_ref r " +
             " on b.demand_id = r.ref_id  " +
             "  left join pm_demand p on  b.demand_id = p.demand_id " +
-            " where b.demand_id !=-1 and  ( #{isAdmin} " +
+            " where b.demand_id != -1 and  ( #{isAdmin} " +
             " or if(#{roleFlay},(r.dept_id = #{deptId} and  r.ref_type = 1), p.purchase_dept_id = #{deptId}  ) " +
             " )" +
             " and (#{noticeName} is null  or   b.name like concat('%',#{noticeName},'%'))  " +