From ec7a9dbb08ffe8d8f22e4c7a64b182b7e5b76c27 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: Sun, 5 May 2024 22:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4diamagnetic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/project/projectMeasure/index.vue           | 2 +-
 .../src/views/project/projectMeasure/projectMeasureDrawer.vue | 4 ++--
 .../resources/mapper/trouble/SmzSspProblemmodifyMapper.xml    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue
index 183972cf..e962998e 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/index.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue
@@ -601,7 +601,7 @@ export default {
         if(this.form.measureType=='6'){
           return dict.raw.remark == 'gjgc' || dict.raw.remark == 'all';
         }else{
-          return !dict.raw.remark || dict.raw.remark == 'all';
+          return dict.raw.remark == null || dict.raw.remark == 'all';
         }
       }else{
         return false;
diff --git a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
index 1ff49b33..49e3dde1 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
@@ -285,9 +285,9 @@ export default {
     showInfoType(dict) {
       if (this.form.measureType) {
         if (this.form.measureType == '6') {
-          return dict.raw.remark == 'gjgc';
+          return dict.raw.remark == 'gjgc' || dict.raw.remark == 'all';
         } else {
-          return dict.raw.remark == null;
+          return dict.raw.remark == null || dict.raw.remark == 'all';
         }
       } else {
         return false;
diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index 104005d7..03d5e467 100644
--- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -723,7 +723,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UNION ALL
         select '97' as infotype,fli1.approve_status as checkState,count(1) as total from flow_labour_info  fli1
         left join sur_project sp on fli1.project_id=sp.id
-        where fli1.is_del=0 and fli1.approve_status='100'
+        where fli1.is_del=0
         <if test="projectId &gt; 0"> and fli1.project_id=#{projectId}</if>
         <if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
         <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>