From 680faf3b2088c66158e7c66b51f86c8b47ef0a9d Mon Sep 17 00:00:00 2001
From: liuqingkun <LIUqk6666_>
Date: Sun, 25 Jun 2023 09:20:10 +0800
Subject: [PATCH] bug fix

---
 .../service/impl/AppealMediationServiceImpl.java  | 15 +++++++++++++--
 .../business/utils/LocalDateTimeUtils.java        |  8 ++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java
index e54e8b5..e8e93bc 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java
@@ -19,6 +19,7 @@ package org.springblade.modules.business.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.springblade.common.cache.DictBizCache;
+import org.springblade.common.cache.UserCache;
 import org.springblade.common.constant.BusinessConstant;
 import org.springblade.common.enums.DictEnum;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -173,7 +174,12 @@ public class AppealMediationServiceImpl extends BaseServiceImpl<AppealMediationM
 		DictBiz street = DictBizCache.getById(appeal.getStreetId());
 		vo.setStreetName(Func.isEmpty(street) ? "" : street.getDictValue());
 		vo.setDisputeId(appeal.getDisputeId());
-		vo.setDisputeName(appeal.getDisputeName());
+		if (Func.isNotEmpty(appeal.getDisputeId()) && appeal.getDisputeId() != -1) {
+			DictBiz dispute = DictBizCache.getById(appeal.getDisputeId());
+			vo.setDisputeName(Func.isNotEmpty(dispute) ? dispute.getDictValue() : "");
+		} else {
+			vo.setDisputeName(appeal.getDisputeName());
+		}
 		vo.setDisputeLevel(appeal.getDisputeLevel());
 		if (Func.isNotEmpty(appeal.getDisputeLevel())) {
 			// 纠纷等级(事件等级), 0:简单, 1:一般, 2:重大, 3:疑难
@@ -195,7 +201,12 @@ public class AppealMediationServiceImpl extends BaseServiceImpl<AppealMediationM
 			vo.setDisputeLevelName("");
 		}
 		vo.setDisposeDept(appealReg.getDisposeDept());
-		vo.setDisposeDeptName(appealReg.getDisposeDeptName());
+		if (Func.isNotEmpty(appealReg.getDisposeDept())) {
+			User u = UserCache.getUser(Long.parseLong(appealReg.getDisposeDept()));
+			vo.setDisposeDeptName(u.getName());
+		} else {
+			vo.setDisposeDeptName(appealReg.getDisposeDeptName());
+		}
 		vo.setProtocol(appealReg.getProtocol());
 		vo.setOpinion(appealReg.getOpinion());
 		vo.setReviewOpinion(appealReg.getReviewOpinion());
diff --git a/src/main/java/org/springblade/modules/business/utils/LocalDateTimeUtils.java b/src/main/java/org/springblade/modules/business/utils/LocalDateTimeUtils.java
index eeec2f6..6288717 100644
--- a/src/main/java/org/springblade/modules/business/utils/LocalDateTimeUtils.java
+++ b/src/main/java/org/springblade/modules/business/utils/LocalDateTimeUtils.java
@@ -471,9 +471,13 @@ public class LocalDateTimeUtils {
 		boolean flag = true;
 		while (flag) {
 			monList.add(start.format(fmt));
-			start = start.plus(1L, ChronoUnit.MONTHS);
-			if (start.getYear() >= end.getYear() && start.getMonth() == end.getMonth()) {
+			if(start.format(fmt).equals(end.format(fmt))){
 				flag = false;
+			}else{
+				start = start.plus(1L, ChronoUnit.MONTHS);
+				if (start.getYear() >= end.getYear() && start.getMonth() == end.getMonth()) {
+					flag = false;
+				}
 			}
 		}