From a0abfe7d63438c09ac0d3a18f05ee706c8688a98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Fri, 26 Apr 2024 01:39:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yanzhu/jh/bigscreen/web/controller/FloweController.java | 2 ++
 .../java/com/yanzhu/jh/flow/service/IFlowLabourInfoService.java | 1 +
 .../src/main/resources/mapper/flow/FlowLabourInfoMapper.xml     | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java
index fe1d2816..418dc17a 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java
@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/bgscreen/flow")
@@ -223,6 +224,7 @@ public class FloweController extends BaseController {
     @PostMapping("/findFlowLabourList")
     public TableDataInfo list(@RequestBody FlowLabourInfo flowLabourInfo)
     {
+        startPage();
         List<FlowLabourInfo> list = flowLabourInfoService.selectFlowLabourInfoList(flowLabourInfo);
         return getDataTable(list);
     }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/IFlowLabourInfoService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/IFlowLabourInfoService.java
index 149d3c35..40d8443d 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/IFlowLabourInfoService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/IFlowLabourInfoService.java
@@ -2,6 +2,7 @@ package com.yanzhu.jh.flow.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.yanzhu.jh.flow.domain.FlowLabourInfo;
+import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 
 import java.util.List;
 import java.util.Map;
diff --git a/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml b/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml
index a4d34c21..4f873047 100644
--- a/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml
@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test='nowRole == "15" or nowRole == "16" or nowRole == "17"'> and fl.approve_status in ('10','20','21','30','31','100') and sp.id in (select spui.project_id from sur_project_userinfo spui where spui.dept_id = #{nowDept} and spui.user_id=(select su.user_id from sys_user su where su.user_name=#{nowUser}) and spui.job_type='24' and spui.is_del=0)</if>
             <if test='activeName == "jxz"'>
+                <if test="nowRole == null"> and fl.approve_status &lt; 100</if>
                 <if test='nowRole == "4"'> and fl.approve_status in ('20','31')</if>
                 <!--监理单位/总包公司/分包单位查询当前关联数据-->
                 <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and fl.approve_status in ('10','21')</if>
@@ -66,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and fl.approve_status != '100'
             </if>
             <if test='activeName == "ywc"'>
+                <if test="nowRole == null"> and fl.approve_status = 100</if>
                 <if test='nowRole == "4"'> and fl.approve_status in ('21','30','100')</if>
                 <!--监理单位/总包公司/分包单位查询当前关联数据-->
                 <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and fl.approve_status in ('11','20','30','31','100')</if>