办事指南调整

src/main/java/com/xjrsoft/module/oa/controller/OfficialDocumentReceivedHandleController.java

@@ -42,7 +42,6 @@ import java.util.List;
 @AllArgsConstructor
 public class OfficialDocumentReceivedHandleController {
 
-    private final IOfficialDocumentReceivedService officialDocumentReceivedService;
     private final IOfficialDocumentReceivedHandleService officialDocumentReceivedHandleService;
 
     @GetMapping(value = "/page")

src/main/java/com/xjrsoft/module/oa/service/impl/OfficialDocumentReceivedHandleServiceImpl.java

@@ -21,6 +21,6 @@ import org.springframework.stereotype.Service;
 public class OfficialDocumentReceivedHandleServiceImpl extends MPJBaseServiceImpl<OfficialDocumentReceivedHandleMapper, OfficialDocumentReceivedHandle> implements IOfficialDocumentReceivedHandleService {
     @Override
     public Page<OfficialDocumentReceivedHandlePageVo> getPage(Page<OfficialDocumentReceivedHandlePageVo> page, OfficialDocumentReceivedHandlePageDto dto) {
-        return this.getPage(page, dto);
+        return this.baseMapper.getPage(page, dto);
     }
 }

src/main/resources/mapper/oa/NewsMapper.xml

@@ -6,8 +6,7 @@
     <select id="manageBox" parameterType="com.xjrsoft.module.oa.dto.NewsPageDto"
             resultType="com.xjrsoft.module.oa.vo.NewsPageVo">
         select
-        t.*,
-        t2.name as classIdCN
+        t.*
         from xjr_oa_news t
         where t.delete_mark = 0
         <if test="dto.type != null and dto.type > 0">

src/main/resources/mapper/oa/OfficialDocumentReceivedHandleMapper.xml

@@ -10,7 +10,7 @@
         SELECT GROUP_CONCAT(c2.name) FROM official_document_received_handle c1
         INNER JOIN xjr_user c2 ON c1.receive_user_id = c2.id
         WHERE c1.delete_mark = 0 AND c1.official_document_received_id = t1.id
-        ),',', '>') AS receive_user_name,t1.is_handle,t4.handle_user_name,t1.handle_time FROM official_document_received t1
+        ),',', '>') AS receive_user_name,t1.is_handle,t4.name as handle_user_name,t1.handle_time FROM official_document_received t1
         INNER JOIN xjr_workflow_form_relation t2 ON t1.id =  CAST(t2.form_key_value AS SIGNED)
         LEFT JOIN xjr_user t3 ON t1.handle_duty_user_id = t3.id
         LEFT JOIN xjr_user t4 ON t1.handle_user_id = t4.id