From 6175ae47853d55ef6431c72539ad96948e598ebf Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Fri, 2 Dec 2022 18:13:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRevisePlanLogServiceImpl.java   |  4 ++--
 .../service/impl/EsRevisePlanServiceImpl.java      | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java
index 16b82934..43eaf36e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java
@@ -70,9 +70,9 @@ public class EsRevisePlanLogServiceImpl extends ServiceImpl<EsRevisePlanLogDao,
                 case "4":
                     //更名
                     String renameEs = (String) qbfsForm.get("renameEs");
-                    if(!esName.equals(renameEs)) {
+                    //if(!esName.equals(renameEs)) {
                         msg = msg + "修改了《" + esName + "》 , “企标名称”由“" + esName + "”改为“" + renameEs + "”;";
-                    }
+                    //}
                     break;
             }
             if (ObjectUtils.isNotEmpty(esId)&&ObjectUtils.isEmpty(esId1)&&ObjectUtils.isEmpty(esId2)) {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
index f93b09e5..c6734ac9 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
@@ -87,13 +87,13 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
     public String modPlan(EsRevisePlan esRevisePlan) {
         List<EsRevisePlan> esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan);
         //添加日志信息 日志数据进行组合 对象数据转换为json 仅支持修改企业名称
-        EsRevisePlan selectById = esRevisePlanDao.selectById(esRevisePlan.getId());
-        HashMap<String, String> mapJson = new HashMap<>();
-        mapJson.put("type","4");
-        mapJson.put("esId",esRevisePlan.getId());
-        mapJson.put("esName",selectById.getEsName());
-        mapJson.put("renameEs",esRevisePlan.getEsName());
-        esRevisePlanLogService.addLog(JSON.parseObject(JSON.toJSONString(mapJson)));
+//        EsRevisePlan selectById = esRevisePlanDao.selectById(esRevisePlan.getId());
+//        HashMap<String, String> mapJson = new HashMap<>();
+//        mapJson.put("type","4");
+//        mapJson.put("esId",esRevisePlan.getId());
+//        mapJson.put("esName",selectById.getEsName());
+//        mapJson.put("renameEs",esRevisePlan.getEsName());
+// esRevisePlanLogService.addLog(JSON.parseObject(JSON.toJSONString(mapJson)));
         if (esRevisePlans.size()>0){
             return "企标名称不能重复,请更换新的企标名称。";
         }else {