From 79fbe8506c4b8a07732010fc0ddee03308add35a Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Fri, 10 Jun 2022 13:56:16 +0800
Subject: [PATCH] =?UTF-8?q?bug53699=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9+53598=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=90=8D=E4=B8=8B=E5=88=92=E7=BA=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java      | 14 +++++++++++---
 .../tag/service/impl/OnlCgformTagServiceImpl.java  | 12 ++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
index 00b97428c..972700b6c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
@@ -90,6 +90,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
 
     @Autowired
     private DummyLogEOServiceImpl dummyLogEOService;
+    @Autowired
+    private DummyInventoryBaseEOMapper dummyInventoryBaseEOMapper;
 
     /**
      * 保存
@@ -304,7 +306,13 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                 }
             }
         }
-
+        Date now = new Date();
+        UpdateWrapper<DummyInventoryBaseEO> baseWrapper=new UpdateWrapper<>();
+        baseWrapper.set("update_by",sysUser.getUsername())
+                .set("update_time",now)
+                .set("state",dummyInventoryBaseEO.getState())
+                .eq("id",dummyInventoryBaseEO.getId());
+        dummyInventoryBaseEOMapper.update(null,baseWrapper);
 //        this.updateById(dummyInventoryBaseEO);
         //不管有没有维护清单,都返回操作成功
         //发布与撤回均需要发消息(向订阅的人员发消息)
@@ -368,7 +376,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                 List<DummyContentChangeEO> dummyContentChangeEOInfoList = iDummyContentChangeEOService.list(wrapperInfo);
 
                 Date lastIssueTime = null;
-                Date now = new Date();
+
 
                 if (CollectionUtils.isNotEmpty(dummyContentChangeEOInfoList)) {
                     lastIssueTime = dummyContentChangeEOInfoList.get(0).getUpdateTime();
@@ -1098,7 +1106,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     contentInfo = "The " + hrefUrl + " virtual list you subscribed to has been updated as follows : " + "\r\n";
                     contentInfoTemp = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "\r\n";
                     //拼接维护清单的消息
-                    contentInfo = setContentInfo(contentInfo, baseDiff,null);
+                    contentInfo = setContentInfo(contentInfo, baseDiff,contentLog);
                     contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff,contentLog);
                     //封装消息的实体类
                     SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
index d25fead6b..256c07b4f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
@@ -141,9 +141,9 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 				onlCgformTag.setDbFieldName("grp_" + onlCgformTag.getDbFieldName());
 			}
 
-			if(StringUtils.isNotBlank(onlCgformTag.getDbFieldEnName())){
-				onlCgformTag.setDbFieldEnName(onlCgformTag.getDbFieldEnName().replace(" ","_"));
-			}
+//			if(StringUtils.isNotBlank(onlCgformTag.getDbFieldEnName())){
+//				onlCgformTag.setDbFieldEnName(onlCgformTag.getDbFieldEnName().replace(" ","_"));
+//			}
 		}
 		save(onlCgformTag);
 	}
@@ -196,9 +196,9 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 		//字段名称设置成拼音+下划线,存入数据库
 		String pinYin = HanYuPinYinUtil.changeToNumberPinYin(onlCgformTag.getDbFieldTxt());
 		onlCgformTag.setDbFieldName(pinYin.replace(" ","_"));
-		if(StringUtils.isNotBlank(onlCgformTag.getDbFieldEnName())){
-			onlCgformTag.setDbFieldEnName(onlCgformTag.getDbFieldEnName().replace(" ","_"));
-		}
+//		if(StringUtils.isNotBlank(onlCgformTag.getDbFieldEnName())){
+//			onlCgformTag.setDbFieldEnName(onlCgformTag.getDbFieldEnName().replace(" ","_"));
+//		}
 		//处理DBLength为null的情况，默认为100
 		if (onlCgformTag.getDbLength() == null){
 			onlCgformTag.setDbLength(100);