会计-项目管理,报告管理

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -287,8 +287,6 @@
         cw_wci.payment_method,
         cw_wcb.name as client_contacts_name,
         cw_pbt.name as business_type_name,
-        nl.report_date,
-        nl.report_type as cwReportType,
         b.member_count
         from cw_project_records a
         left join sys_user su on su.id = a.create_by_id and su.del_flag = '0'
@@ -305,8 +303,8 @@
         left join cw_project_members cpm on a.id = cpm.project_id
         left join sys_user sub on cpm.user_id = sub.id
         left join sys_user_manage_office sumo on sumo.office_id = sub.office_id
-        LEFT JOIN cw_project_report pr on a.id = pr.project_id
-        LEFT JOIN cw_project_report_new_line  nl on pr.id = nl.report_id
+        LEFT JOIN cw_project_report pr on a.id = pr.project_id and pr.del_flag = '0'
+        LEFT JOIN cw_project_report_new_line  nl on pr.id = nl.report_id and nl.del_flag = '0'
         ${ew.customSqlSegment}
         ORDER BY a.create_time DESC
     </select>