Merge remote-tracking branch 'origin/master'

fuliqi

2025-01-21 3c81c99e7aab63c6b1afe39839ef778d594af4a8

Merge remote-tracking branch 'origin/master'

 business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java

@@ -305,6 +305,8 @@
            if (Objects.nonNull(project)) {
                taskVO.setProjectId(project.getId());
                taskVO.setProjectName(project.getProjectName());
            } else {
                continue;
            }

            // 流程发起人信息
@@ -364,6 +366,9 @@
            taskVO.setHandlerUnitName(handlerUnitNames);
            vos.add(taskVO);
        }
        if (vos.size() < pageSize) {
            result.total(vos.size());
        }
        result.put("taskList", vos);
    }


 business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml

@@ -189,7 +189,7 @@
        from t_project_plan_examine_record ppe
                 LEFT JOIN t_project_plan_info ppi on ppe.project_plan_info_id = ppi.id
                 LEFT JOIN t_project_plan_record ppr on ppe.project_plan_record_id = ppr.id
                 LEFT JOIN t_project_info pi on ppr.project_info_id = pi.id
                 INNER JOIN t_project_info pi on ppr.project_info_id = pi.id AND pi.deleted = 0
        WHERE ppe.department_user_id = #{userId} or manager_user_id = #{userId}
    </select>