From 1c7e3d2fc6867beaf5b93dd8e2e4c049df16ccd1 Mon Sep 17 00:00:00 2001
From: Chujinwang <17638147107@163.com>
Date: Thu, 1 Aug 2024 09:10:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=A7=84=E5=88=99=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/service/impl/WrkAuditRuleServiceImpl.java       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkAuditRuleServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkAuditRuleServiceImpl.java
index ba2cc51..aeffb21 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkAuditRuleServiceImpl.java
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkAuditRuleServiceImpl.java
@@ -65,6 +65,7 @@ import com.chushang.task.enums.ServiceEnum;
 import com.chushang.task.enums.TaskTypeEnum;
 import com.chushang.task.feign.RemoteTaskService;
 import lombok.RequiredArgsConstructor;
+import org.bouncycastle.util.Strings;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -105,7 +106,9 @@ public class WrkAuditRuleServiceImpl extends ServiceImpl<WrkAuditRuleMapper, Wrk
             for (String s : record.getRuleTime().split(",")) {
                 list.add(date.get(s));
             }
-            record.setRuleTimeList(Arrays.asList(String.join(",", list)));
+            record.setRuleTimeList(Arrays.asList(record.getRuleTime().split(",")));
+            record.setRuleTime(String.join(",", list));
+
         }
 
         return new PageResult(page);
@@ -118,7 +121,7 @@ public class WrkAuditRuleServiceImpl extends ServiceImpl<WrkAuditRuleMapper, Wrk
             Assert.notNull(wrkAuditRule, "修改失败，数据不存在");
             BeanUtil.copyProperties(dto, wrkAuditRule);
             if(!dto.getRuleTimeList().isEmpty()){
-                wrkAuditRule.setRuleTime(String.join(",", dto.getRuleTime()));
+                wrkAuditRule.setRuleTime(String.join(",", dto.getRuleTimeList()));
             }
             return this.updateById(wrkAuditRule) ? 1 : 0;
         } else {
@@ -127,7 +130,7 @@ public class WrkAuditRuleServiceImpl extends ServiceImpl<WrkAuditRuleMapper, Wrk
             wrkAuditRule.setId(IdUtil.getSnowflakeNextId());
             wrkAuditRule.setDeptId(SecurityUtils.getDeptId());
             wrkAuditRule.setUserId(SecurityUtils.getUserId());
-            wrkAuditRule.setRuleTime(String.join(",", dto.getRuleTime()));
+            wrkAuditRule.setRuleTime(String.join(",", dto.getRuleTimeList()));
             return this.save(wrkAuditRule) ? 1 : 0;
         }
     }