hexiao 2 роки тому
батько
коміт
c6ddbd8af4

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

@@ -23,13 +23,13 @@ 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 ( #{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},'%'))  " +
             " and (#{type} is null  or   b.type = #{type})  " +
             " and (#{startTime} is null  or   to_days(b.release_time) >= to_days(#{startTime}) ) " +
             " and (#{entTime} is null  or   to_days(b.release_time) <= to_days(#{entTime}) ) " +
-            " group by b.demand_id order by b.release_time desc")
+            " group by b.id order by b.release_time desc")
     List<BaseNotice> query(BaseNoticePageReqVo vo);
 }