fix:项目管理修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ProjectManageController.java

@@ -198,4 +198,15 @@ public class ProjectManageController extends BaseController
         List<ProjectManage> projectManageList = projectManageService.selectProjectManageList(new ProjectManage());
         return AjaxResult.success(projectManageList);
     }
+
+    /*
+    * 获取草稿箱项目列表
+    * 下拉框
+    * */
+    @GetMapping("/getDraftProjectList")
+    public AjaxResult getDraftProjectList()
+    {
+        List<ProjectManage> projectManageList = projectManageService.selectProjectManageListDraft(new ProjectManage());
+        return AjaxResult.success(projectManageList);
+    }
 }

ruoyi-system/src/main/resources/mapper/project/ProjectManageMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="projectType != null  and projectType != ''">
           and project_type = #{projectType}</if>
         <if test="departmentLeaderId!= null ">
-          and pm.department_leader_id = #{departmentL}</if>
+          and pm.department_leader_id = #{departmentLeaderId}</if>
         <if test="projectManagerId!= null ">
           and pm.project_manager_id = #{projectManagerId}</if>
         <if test="projectStatus != null  and projectStatus != ''">
@@ -82,6 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join project_member pmem on pmem.project_id = pm.id
         left join sys_user su on su.user_id = pmem.user_id
         where pm.del_flag = '0' and pm.draft = '0'
+        <if test="id != null and id != ''">
+            and pm.id = #{id}
+        </if>
         <if test="projectNumber != null  and projectNumber != ''">
             and pm.project_number = #{projectNumber}</if>
         <if test="projectName != null  and projectName != ''">
@@ -89,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="projectType != null  and projectType != ''">
             and project_type = #{projectType}</if>
         <if test="departmentLeaderId!= null ">
-            and pm.department_leader_id = #{departmentL}</if>
+            and pm.department_leader_id = #{departmentLeaderId}</if>
         <if test="projectManagerId!= null ">
             and pm.project_manager_id = #{projectManagerId}</if>
         <if test="projectStatus != null  and projectStatus != ''">