修改项目库部门查询无效

hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/enumeration/MeetingReviewTypeEnum.java

@@ -32,7 +32,7 @@ public enum MeetingReviewTypeEnum {
 
     PROJECT_REVIEW("项目评审", "6"),
 
-    REQUIREMENT_REVIEW("需求论证", "7");
+    EXPERT_REVIEW("专家论证", "7");
 
     private final String value;
     private final String code;

hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java

@@ -942,7 +942,7 @@ public class MeetingManage {
             case FAIRNESS_REVIEW:
                 break;
             case PROJECT_REVIEW:
-            case REQUIREMENT_REVIEW:
+            case EXPERT_REVIEW:
                 buildOptionProjectQuery(query, meetingType, ProjectStatus.WITHOUT_PROJECT_REVIEW);
                 break;
             default:

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java

@@ -440,6 +440,10 @@ public class ProjectLibManage {
         if (!buildProjectLibPermission(req, user)) {
             return PageVo.empty();
         }
+        if (req.getDeclaredUnitId() != null) {
+            List<Long> viewUnitIds = mhUnitCache.getViewChildIdsRecursion(req.getDeclaredUnitId());
+            req.setDeclaredUnitIds(viewUnitIds);
+        }
         Page<ProjectPO> page = projectService.pageLibWithPermission(req.page(), req);
 
         if (CollUtil.isEmpty(page.getRecords())) {

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.xml

@@ -338,6 +338,12 @@
         <if test="req.id != null">
             and p.id = #{req.id}
         </if>
+        <if test="req.declaredUnitIds != null and req.declaredUnitIds.size > 0">
+            and p.build_org_code in
+            <foreach collection="req.declaredUnitIds" close=")" open="(" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="req.projectName != null and req.projectName != ''">
             and p.project_name like concat('%',#{req.projectName},'%')
         </if>

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/req/ProjectListReq.java

@@ -122,4 +122,6 @@ public class ProjectListReq extends PagePo {
 
     private Long declaredUnitId;
 
+    private List<Long> declaredUnitIds;
+
 }