From 8f917a040721e6fdafa0c7089296adc3d4143d62 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Mon, 6 Nov 2023 09:37:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=2077885=20=E4=BC=81=E4=B8=9A=E6=A0=87?=
 =?UTF-8?q?=E5=87=86-=E6=96=B0=E5=A2=9E=20=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E9=83=BD=E8=BE=93=E5=85=A5=E6=BB=A1=E4=BD=8D=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=AD=97=E6=AE=B5=E5=A4=AA=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/laws/common/constant/FieldCommon.java  |  3 ++-
 .../common/service/impl/LawsCommonServiceImpl.java | 14 ++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java
index 3aa278ce..1397dfe9 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java
@@ -60,7 +60,8 @@ public class FieldCommon {
             "substitute_standard_number",
             "replaced_by_standard_number",
             "reference_standard",
-            "referenced_standard"
+            "referenced_standard",
+            "auth_dept"
     );
 
     public static final String MODULE = "module";  // 表名标识
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index b5e4ac6d..9f5995fd 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -599,11 +599,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         StringBuilder valuesBuilder = new StringBuilder();
         // 对默认的字段赋值
         String id = getCommonInsertValue(fieldsBuilder, valuesBuilder);
-        // 企标授权部门处理
-        if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(module)) {
-            esAuthUserService.resetAuthDept(id, parameterMap.get(FieldCommon.AUTH_DEPT).toString());
-            parameterMap.remove(FieldCommon.AUTH_DEPT);
-        }
         // 拼接要添加的数据
         for (Map.Entry<String, Object> entryMap : parameterMap.entrySet()) {
             String key = entryMap.getKey();
@@ -801,11 +796,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
             /*parameterMap.put(FieldCommon.REFERENCE_STANDARD, "");
             parameterMap.put(FieldCommon.REFERENCED_STANDARD, "");*/
         }
-        // 清空parameterMap中的对应字段
-        parameterMap.remove(FieldCommon.REPLACED_STANDARD);
-        parameterMap.remove(FieldCommon.REPLACED_BY_STANDARD);
-        parameterMap.remove(FieldCommon.REFERENCE_STANDARD);
-        parameterMap.remove(FieldCommon.REFERENCED_STANDARD);
     }
 
     /**
@@ -1534,6 +1524,10 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
     private void jointInsertFieldAndValue(List<LawsTag> fieldList, StringBuilder fieldsBuilder,
                                           StringBuilder valuesBuilder, String key, String value,
                                           String id, String standardNumber) {
+        if (FieldCommon.SPECIFIC_UPDATE_FIELD.contains(key)) {
+            // 特殊字段不做新增sql
+            return;
+        }
         for (LawsTag lawsTag : fieldList) {
             if (key.equals(lawsTag.getDbFieldName())) {
                 jointInsertFieldSetValue(lawsTag, fieldsBuilder, valuesBuilder, key, value, id, standardNumber);