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 and sp.projectName like concat('%', #{projectName}, '%') - and sp.deptId = #{projectDeptId} + and sp.deptId = #{deptId} and sp.projectType = #{projectType} and sp.projectNature = #{projectNature} ORDER by sp.projectSort