zoujiajian vor 2 Jahren
Ursprung
Commit
3cc9217cce

+ 4 - 5
netflix-dao/src/main/java/com/cyksj/model/dto/YhServiceChangeDto.java

@@ -30,7 +30,6 @@ public class YhServiceChangeDto {
 
 	public String toChangeString() {
 		StringBuilder sb = new StringBuilder();
-		sb.append("在");
 		if (StrUtil.equals(sign, "workday")) {
 			sb.append("工作日").append(index == 1 ? "早班" : "晚班");
 		} else if (StrUtil.equals(sign, "Saturday")) {
@@ -41,14 +40,14 @@ public class YhServiceChangeDto {
 			sb.append("节假日").append(date).append(workType);
 		}
 		if (beforeSelect.size() > 0) {
-			sb.append("移除了值班客服");
-			String beforeCollect = beforeSelect.stream().collect(Collectors.joining(","));
+			sb.append(" - 移除 - ");
+			String beforeCollect = beforeSelect.stream().collect(Collectors.joining(""));
 			sb.append(beforeCollect);
 		}
 
 		if (afterSelect.size() > 0) {
-			sb.append("增加了值班客服");
-			String afterCollect = afterSelect.stream().collect(Collectors.joining(","));
+			sb.append(" - 增加 - ");
+			String afterCollect = afterSelect.stream().collect(Collectors.joining(""));
 			sb.append(afterCollect);
 		}
 		return sb.toString();

+ 3 - 5
netflix-service/src/main/java/com/cyksj/service/sys/impl/SysConfigChangeRecordServiceImpl.java

@@ -52,7 +52,7 @@ public class SysConfigChangeRecordServiceImpl extends ServiceImpl<SysConfigChang
 				sysConfigChangeRecord.setPreValue(sysValue);
 				sysConfigChangeRecord.setBackValue(updateValue);
 				sysConfigChangeRecord.setOperator(cmsUser.getNickname());
-				if (Constant.serviceKeys.get(0).equals(sysValue)) {
+				if (Constant.serviceKeys.get(0).equals(sysKey)) {
 					//变更记录
 					List<YhServiceDto> before = Jsons.parseList(sysValue, YhServiceDto.class);
 					List<YhServiceDto> after = Jsons.parseList(updateValue, YhServiceDto.class);
@@ -70,10 +70,8 @@ public class SysConfigChangeRecordServiceImpl extends ServiceImpl<SysConfigChang
 							//变更记录
 							YhServiceChangeDto changeService = getChangeService(beforeServiceDto, afterServiceDto);
 							if (changeService != null) {
-								if (changeStr.length() == 0) {
-									changeStr.append("客服").append(sysConfigChangeRecord.getOperator());
-								} else {
-									changeStr.append(";");
+								if (changeStr.length() > 0) {
+									changeStr.append(";");
 								}
 								changeStr.append(changeService.toChangeString());
 							}