Merge branch 'dev_nc2k_20251213' into dev

# Conflicts: # mhd-auth/src/main/resources/bootstrap.yml # mhd-gateway/src/main/resources/bootstrap.yml # mhd-modules/mhd-system/src/main/resources/bootstrap.yml # mhd-user-center/src/main/resources/bootstrap.yml # mhd_finance/src/main/resources/bootstrap.yml # mhd_product/src/main/resources/bootstrap.yml # mhd_thrid_party/src/main/resources/bootstrap.yml # mhd_transport/src/main/resources/bootstrap.yml
2025-12-13 17:32:20 +08:00
parent 74e735353f 3447d2f7bc
commit f8399951b3
19 changed files with 371 additions and 106 deletions
@@ -7,6 +7,8 @@ import com.linke.finance.interfaces.dto.approvalDocument.DingDingHuiDiaoDTO;
 import com.linke.finance.interfaces.vo.ApprovalStatsVO;
 import com.linke.finance.until.DingCallbackCrypto;
 import com.mhd.common.core.domain.entity.R;
+
+import java.rmi.ServerException;
 import java.util.List;
 import java.util.Map;

@@ -56,8 +58,17 @@ public class ApprovalDocumentApi extends BaseController{
        //转换实体
        ApprovalDocumentDO approvalDocumentDO = approvalDocumentAssembler.toDO(approvalDocumentDTO);
        startPage();
-        List<ApprovalDocumentPO> list = approvalDocumentApplicationService.queryList(approvalDocumentDO);
-        return getDataTable(list);
+        List<ApprovalDocumentPO> list = null;
+        try {
+            list = approvalDocumentApplicationService.queryList(approvalDocumentDO);
+            return getDataTable(list);
+        } catch (ServerException e) {
+            e.printStackTrace();
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
    }

    /**