Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProjectReportMapper.java

@@ -99,6 +99,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @param id
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     String getProcessInstanceIdById(String id);
 
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -2300,7 +2300,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     }
 
     public CwProjectReportSignature findBySignatureId(String signatureId) {
-        return cwProjectReportSignatureMapper.selectById(signatureId);
+        return cwProjectReportSignatureMapper.getInfoById(signatureId);
     }
 
     public String updateSignatureStatusById(CwProjectReportSignatureDTO data) {
@@ -2677,7 +2677,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
     public void saveReportArchive (String reportId) throws Exception {
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        CwProjectReport cwProjectReport = cwProjectReportService.getById(reportId);
+        CwProjectReport cwProjectReport = cwProjectReportService.getCwProjectReportById(reportId);
         CwProjectReportArchive cwProjectReportArchive = new CwProjectReportArchive();
         cwProjectReportArchive.setStatus("0");
         cwProjectReportArchive.setReportId(reportId);
@@ -3084,4 +3084,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             reportMapper.updateCwProjectReportDataById(report);
         }
     }
+
+    public CwProjectReport getCwProjectReportById(String id){
+        return reportMapper.getById(id);
+    }
 }