s

purchase-admin/src/main/java/com/ozs/web/controller/plan/MonthlyReconciliationController.java

@@ -64,6 +64,7 @@ public class MonthlyReconciliationController extends BaseController {
     public AjaxResult page(@NotEmpty(message = "数据为空")
                            @RequestBody MonthlyReconciliationPageReqVo vo) {
         vo.setDeptId(getDeptId());
+        vo.setUserId(getUserId());
         // 分页查询
         IPage<MonthlyReconciliation> page = monthlyReconciliationService.queryPage(vo);
         if (!ObjectUtils.isEmpty(page.getRecords()) && page.getRecords().size() > 0) {

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/MonthlyReconciliationPageReqVo.java

@@ -38,4 +38,6 @@ public class MonthlyReconciliationPageReqVo extends PageVo {
     private String warnStatus;
 
     private Long deptId;
+
+    private Long userId;
 }

purchase-system/src/main/java/com/ozs/plan/mapper/MonthlyReconciliationMapper.java

@@ -15,8 +15,8 @@ public interface MonthlyReconciliationMapper extends BaseMapper<MonthlyReconcili
 
     @Select("select p.* from " +
             " pm_demand p left join pm_audit_dept_ref r " +
-            " on p.demand_id = r.ref_id  and  r.ref_type = 2 " +
-            " where r.dept_id = #{deptId}  " +
+            " on p.demand_id = r.ref_id   " +
+            " where (#{userId} = 1  or  (r.dept_id = #{deptId} and  r.ref_type = 2) )    " +
             " and (#{projectName} is null  or   p.project_name like concat('%',#{projectName},'%'))  " +
             " and (#{purchaseServices} is null  or   p.purchase_services = #{purchaseServices})  " +
             " and (#{projectStatus} is null  or   p.project_status = #{projectStatus})  " +