From 43241ad17c149ea7af107d316cf8a3bc1b6fde99 Mon Sep 17 00:00:00 2001
From: LiuJiaNan <15703339975@163.com>
Date: Fri, 16 Jan 2026 11:01:07 +0800
Subject: [PATCH] =?UTF-8?q?bug=EF=BC=9A13787=E3=80=8113786=E3=80=8113785?=
 =?UTF-8?q?=E3=80=8113783=E3=80=8113771=E3=80=8113768=E3=80=8113761?=
 =?UTF-8?q?=E3=80=8113759=E3=80=8113756=E3=80=8113754=E3=80=8113229?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                    |  2 +-
 .../BranchCompany/Average/Ignore/List/index.js  |  7 -------
 .../BranchCompany/Average/Ledger/Add/index.js   |  2 +-
 .../Average/Postponement/List/index.js          |  7 -------
 .../Average/Rectification/List/index.js         |  9 +--------
 .../Average/Rectification/Review/index.js       | 17 +++++++++++------
 .../Average/SpecialDisposal/List/index.js       |  7 -------
 7 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/package.json b/package.json
index cd39d3a..6d2a842 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-to-print": "^3.2.0",
-    "zy-react-library": "^1.1.24"
+    "zy-react-library": "^1.1.28"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^5.4.1",
diff --git a/src/pages/Container/BranchCompany/Average/Ignore/List/index.js b/src/pages/Container/BranchCompany/Average/Ignore/List/index.js
index 1969b4a..f064418 100644
--- a/src/pages/Container/BranchCompany/Average/Ignore/List/index.js
+++ b/src/pages/Container/BranchCompany/Average/Ignore/List/index.js
@@ -6,7 +6,6 @@ import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
 import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
 import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary";
-import HiddenPartSelectTree from "zy-react-library/components/SelectTree/HiddenPart/Gwj";
 import Table from "zy-react-library/components/Table";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import { HIDDEN_SOURCE_ENUM } from "zy-react-library/enum/hidden/gwj";
@@ -38,11 +37,6 @@ function List(props) {
             label: "隐患类型",
             render: <DictionarySelectTree dictValue="hiddenType" onlyLastLevel />,
           },
-          {
-            name: "hiddenPart",
-            label: "隐患部位",
-            render: <HiddenPartSelectTree />,
-          },
           { name: "creatorName", label: "隐患发现人" },
           { name: "confirmUserName", label: "确认人" },
           {
@@ -64,7 +58,6 @@ function List(props) {
           },
           { title: "隐患描述", dataIndex: "hiddenDesc" },
           { title: "隐患类型", dataIndex: "hiddenTypeName" },
-          { title: "隐患部位", dataIndex: "hiddenPartName" },
           { title: "隐患发现部门", dataIndex: "hiddenFindDeptName" },
           { title: "隐患发现人", dataIndex: "createName", width: 130 },
           {
diff --git a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js
index d8f9ed6..58f07fc 100644
--- a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js
+++ b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js
@@ -277,7 +277,7 @@ function Add(props) {
         form.setFieldValue("creatorName", userInfo.current.name);
       }
       else {
-        if (getUnprocessedImagesCount() > 0 && form.getFieldValue("isAi") === 1) {
+        if (getUnprocessedImagesCount() > 0 && form.getFieldValue("isAi") === 1 && !query.id) {
           Modal.confirm({
             title: "温馨提示",
             content: "当前有未处理完的隐患图片，是否继续处理",
diff --git a/src/pages/Container/BranchCompany/Average/Postponement/List/index.js b/src/pages/Container/BranchCompany/Average/Postponement/List/index.js
index ad6793f..648b65f 100644
--- a/src/pages/Container/BranchCompany/Average/Postponement/List/index.js
+++ b/src/pages/Container/BranchCompany/Average/Postponement/List/index.js
@@ -7,7 +7,6 @@ import Search from "zy-react-library/components/Search";
 import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
 import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary";
 import HiddenLevelSelectTree from "zy-react-library/components/SelectTree/HiddenLevel/Gwj";
-import HiddenPartSelectTree from "zy-react-library/components/SelectTree/HiddenPart/Gwj";
 import Table from "zy-react-library/components/Table";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import { HIDDEN_RECTIFICATION_TYPE_ENUM, HIDDEN_SOURCE_ENUM, HIDDEN_STATE_ENUM } from "zy-react-library/enum/hidden/gwj";
@@ -40,11 +39,6 @@ function List(props) {
             label: "隐患类型",
             render: <DictionarySelectTree dictValue="hiddenType" onlyLastLevel />,
           },
-          {
-            name: "hiddenPart",
-            label: "隐患部位",
-            render: <HiddenPartSelectTree />,
-          },
           {
             name: "hiddenLevel",
             label: "隐患级别",
@@ -74,7 +68,6 @@ function List(props) {
           { title: "隐患描述", dataIndex: "hiddenDesc" },
           { title: "隐患级别", dataIndex: "hiddenLevelName", width: 100 },
           { title: "隐患类型", dataIndex: "hiddenTypeName" },
-          { title: "隐患部位", dataIndex: "hiddenPartName" },
           { title: "隐患发现部门", dataIndex: "hiddenFindDeptName" },
           { title: "隐患发现人", dataIndex: "createName", width: 130 },
           {
diff --git a/src/pages/Container/BranchCompany/Average/Rectification/List/index.js b/src/pages/Container/BranchCompany/Average/Rectification/List/index.js
index e7f4249..a357bf6 100644
--- a/src/pages/Container/BranchCompany/Average/Rectification/List/index.js
+++ b/src/pages/Container/BranchCompany/Average/Rectification/List/index.js
@@ -9,7 +9,6 @@ import Search from "zy-react-library/components/Search";
 import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
 import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary";
 import HiddenLevelSelectTree from "zy-react-library/components/SelectTree/HiddenLevel/Gwj";
-import HiddenPartSelectTree from "zy-react-library/components/SelectTree/HiddenPart/Gwj";
 import Table from "zy-react-library/components/Table";
 import Upload from "zy-react-library/components/Upload";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
@@ -47,11 +46,6 @@ function List(props) {
             label: "隐患类型",
             render: <DictionarySelectTree dictValue="hiddenType" onlyLastLevel />,
           },
-          {
-            name: "hiddenPart",
-            label: "隐患部位",
-            render: <HiddenPartSelectTree />,
-          },
           {
             name: "hiddenLevel",
             label: "隐患级别",
@@ -81,7 +75,6 @@ function List(props) {
           { title: "隐患描述", dataIndex: "hiddenDesc" },
           { title: "隐患级别", dataIndex: "hiddenLevelName", width: 100 },
           { title: "隐患类型", dataIndex: "hiddenTypeName" },
-          { title: "隐患部位", dataIndex: "hiddenPartName" },
           { title: "隐患发现部门", dataIndex: "hiddenFindDeptName" },
           { title: "隐患发现人", dataIndex: "createName", width: 130 },
           {
@@ -139,7 +132,7 @@ function List(props) {
                     临时安全措施
                   </Button>
                 )}
-                {props.permission("fgs-yqzg-sqyq") && !!record.noReviewExtensionNum &&(
+                {props.permission("fgs-yqzg-sqyq") && !record.noReviewExtensionNum && (
                   <Button
                     type="link"
                     onClick={() => {
diff --git a/src/pages/Container/BranchCompany/Average/Rectification/Review/index.js b/src/pages/Container/BranchCompany/Average/Rectification/Review/index.js
index 0e8ad45..91bffb4 100644
--- a/src/pages/Container/BranchCompany/Average/Rectification/Review/index.js
+++ b/src/pages/Container/BranchCompany/Average/Rectification/Review/index.js
@@ -173,13 +173,18 @@ function Rectification(props) {
                                   span: 12,
                                   rules: [{
                                     validator: (_, value) => {
-                                      // 获取已存在的用户名
-                                      const confirmUserName = data.hiddenConfirmUserCO?.[0]?.rectifyUserId;
-                                      const presetUserName = data?.hiddenUserPresetsCO?.rectifyUserId;
+                                      const confirmUser = data.hiddenConfirmUserCO?.at(-1)?.rectifyUserId;
+                                      const presetUser = data?.hiddenUserPresetsCO?.rectifyUserId;
 
-                                      // 验证是否与已有用户名相同
-                                      if (value && (value === confirmUserName || value === presetUserName)) {
-                                        return Promise.reject(new Error("验收人不能与整改人相同"));
+                                      if (confirmUser) {
+                                        if (value && (value === confirmUser)) {
+                                          return Promise.reject(new Error("验收人不能与整改人相同"));
+                                        }
+                                      }
+                                      else {
+                                        if (value && (value === presetUser)) {
+                                          return Promise.reject(new Error("验收人不能与整改人相同"));
+                                        }
                                       }
 
                                       return Promise.resolve();
diff --git a/src/pages/Container/BranchCompany/Average/SpecialDisposal/List/index.js b/src/pages/Container/BranchCompany/Average/SpecialDisposal/List/index.js
index c40e2e6..2815e15 100644
--- a/src/pages/Container/BranchCompany/Average/SpecialDisposal/List/index.js
+++ b/src/pages/Container/BranchCompany/Average/SpecialDisposal/List/index.js
@@ -7,7 +7,6 @@ import Search from "zy-react-library/components/Search";
 import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
 import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary";
 import HiddenLevelSelectTree from "zy-react-library/components/SelectTree/HiddenLevel/Gwj";
-import HiddenPartSelectTree from "zy-react-library/components/SelectTree/HiddenPart/Gwj";
 import Table from "zy-react-library/components/Table";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import { HIDDEN_RECTIFICATION_TYPE_ENUM, HIDDEN_SOURCE_ENUM } from "zy-react-library/enum/hidden/gwj";
@@ -40,11 +39,6 @@ function List(props) {
             label: "隐患类型",
             render: <DictionarySelectTree dictValue="hiddenType" onlyLastLevel />,
           },
-          {
-            name: "hiddenPart",
-            label: "隐患部位",
-            render: <HiddenPartSelectTree />,
-          },
           {
             name: "hiddenLevel",
             label: "隐患级别",
@@ -74,7 +68,6 @@ function List(props) {
           { title: "隐患描述", dataIndex: "hiddenDesc" },
           { title: "隐患级别", dataIndex: "hiddenLevelName", width: 100 },
           { title: "隐患类型", dataIndex: "hiddenTypeName" },
-          { title: "隐患部位", dataIndex: "hiddenPartName" },
           { title: "隐患发现部门", dataIndex: "hiddenFindDeptName" },
           { title: "隐患发现人", dataIndex: "createName", width: 130 },
           {