From a251af11893443cb9622a7399ed5afb02eb1db4e 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: Tue, 26 Sep 2023 23:51:22 +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

---
 .../src/main/java/com/ruoyi/common/enums/DeptTypeEnum.java      | 2 +-
 .../com/yanzhu/jh/project/controller/SurProjectController.java  | 1 +
 .../src/main/resources/mapper/project/ProjectViewMapper.xml     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeptTypeEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeptTypeEnum.java
index e471a238..14f91223 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeptTypeEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeptTypeEnum.java
@@ -10,7 +10,7 @@ public enum DeptTypeEnum {
 
     JTGSTYPE("3", "泾河产业发展集团"),
     ZGSTYPE("4", "发展集团子公司"),
-    JFDBTYPE("5", "监理单位"),
+    JFDBTYPE("5", "甲方代表"),
     JLDWTYPE("6", "监理单位"),
     ZBDWTYPE("7", "总包单位"),
     FBDWTYPE("8", "分包单位"),
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectController.java
index f482a3ad..d892fb92 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectController.java
@@ -145,4 +145,5 @@ public class SurProjectController extends BaseController
     {
         return toAjax(surProjectService.updateSurProject(surProject));
     }
+
 }
diff --git a/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml
index 8dec585a..a96b176a 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/ProjectViewMapper.xml
@@ -38,7 +38,7 @@
         left JOIN sur_project_unit_info pui on sp.id=pui.projectId and pui.unitType=2
         where pui.del_flag=0
         <if test="projectName != null  and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
-        <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
+        <if test="deptId != null "> and sp.deptId = #{deptId}</if>
         <if test="projectType != null  and projectType != ''"> and sp.projectType = #{projectType}</if>
         <if test="projectNature != null  and projectNature != ''"> and sp.projectNature = #{projectNature}</if>
         ORDER by sp.projectSort