Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js

src/api/staffInfo/index.js

@@ -1,5 +1,6 @@
 import { declareRequest } from "@cqsjjb/jjb-dva-runtime";
-import { apiPost, apiPostDelete, safeAction } from "../enterpriseInfo/http";
+import { apiPost, safeAction } from "../enterpriseInfo/http";
+import { asId } from "../enterpriseInfo/idUtil";
 
 export const staffInfoList = declareRequest(
   "staffInfoLoading",
@@ -25,13 +26,10 @@ export const staffInfoEdit = declareRequest(
 
 export const staffInfoRemove = declareRequest(
   "staffInfoLoading",
-  safeAction(async ({ id }) => apiPostDelete("/safetyEval/org-personnel/delete", id)),
+  safeAction(async ({ id }) => apiPost("/safetyEval/org-personnel/delete", { data: asId(id) })),
 );
 
 export const staffInfoResetPassword = declareRequest(
   "staffInfoLoading",
-  safeAction(async ({ id }) => {
+  safeAction(async ({ id }) => apiPost("/safetyEval/org-personnel/reset-password", { data: asId(id) })),
-    const url = `/safetyEval/org-personnel/reset-password?id=${encodeURIComponent(id)}`;
-    return apiPost(url, {});
-  }),
 );

src/pages/Container/EnterpriseInfo/QualificationCert/index.js

@@ -56,6 +56,13 @@ function QualificationCertPage(props) {
         ...router.query,
         current: router.query.current || 1,
         pageSize: router.query.pageSize || 10,
+        // 映射后端期望的字段名：前端 likeCertName → 后端 certName
+        certName: router.query.likeCertName || undefined,
+        // 映射日期筛选：前端 validStartDate/validEndDate → 后端 startTime/endTime (LocalDateTime 格式)
+        startTime: router.query.validStartDate ? `${router.query.validStartDate} 00:00:00` : undefined,
+        endTime: router.query.validEndDate ? `${router.query.validEndDate} 23:59:59` : undefined,
+        // 后端分页字段名为 size
+        size: router.query.pageSize || 10,
       };
       const res = await props.orgQualificationCertList(params);
       if (res?.success !== false) {