From 2eaf991df827956a31c4f9e6b8601aa9c876cd19 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Tue, 18 Feb 2025 13:41:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huzhou/service/impl/HuzhouContractinfoServiceImpl.java     | 3 +++
 .../service/impl/HuzhouFieldchangehistoryServiceImpl.java      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
index f8a0299..e52848b 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
@@ -372,6 +372,9 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
 
     @Override
     public ContractInfoVo getContractinfoByTaskName(String projectId, String taskName) {
+        if (StrUtil.isBlank(taskName)){
+            return null;
+        }
         if (taskName.equals("合同签订")){
             ContractInfoVo contractInfoVo = new ContractInfoVo();
             List<HuzhouContractinfo> planList = this.getContractinfoByprojectId(projectId);
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java
index ac00295..05f7db7 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java
@@ -325,12 +325,12 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
                 String fieldValue = oldchange.getFieldValue();
                 List<String> strings = HuzhouCommonUtils.extractObjectAttributes(newProjectinfo);
                 for (String s : strings) {
+                    //ep: "Manager=GJH"  manager -> Manager  newValue=GJH
                     if (s.split("=")[0].equals(fieldValue.substring(0, 1).toUpperCase() + fieldValue.substring(1))) {
                         String newValue = s.split("=")[1];
                         oldchange.setNewvalue(newValue);
                         updateById(oldchange);
                     }
-
                 }
             }
         }