From b3123380397990c9a82710dad430f87fb97b4b8f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 15 四月 2024 11:51:39 +0800
Subject: [PATCH] 内网开发环境代码合并

---
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
index 102c534..11d6c37 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
@@ -19,6 +19,7 @@
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.map.CaseInsensitiveMap;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -182,6 +183,7 @@
 									writeValueAsString = mp.writeValueAsString(dataObject);
 									dockingPreApplyForm.setContent(writeValueAsString);
 								} catch (JsonProcessingException e) {
+									throw new ServiceException("淇敼鐢宠鍗曟暟鎹椂杞崲鍑洪敊锛屽師鍥�"+e.getMessage());
 								}
 								Date date = new Date();
 								dockingPreApplyForm.setLastModifyTime(date);
@@ -202,6 +204,7 @@
 									writeValueAsString = mp.writeValueAsString(dataObject);
 									dockingPreApplyForm.setContent(writeValueAsString);
 								} catch (JsonProcessingException e) {
+									throw new ServiceException("鏂板鐢宠鍗曟暟鎹椂鏁版嵁杞崲鍑洪敊锛屽師鍥�"+e.getMessage());
 								}
 								Date date = new Date();
 								dockingPreApplyForm.setCreateTime(date);
@@ -402,12 +405,12 @@
 						}
 					});
 				} else {
+					Date date = new Date();
 					editDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
 						dockingPreApplyForm.setCode("2");
 						dockingPreApplyForm.setMsg("淇敼锛�" + msg);
 						dockingPreApplyForm.setContent("");
 						dockingPreApplyForm.setGroupCode("");
-						Date date = new Date();
 						dockingPreApplyForm.setLastModifyTime(date);
 						dockingPreApplyForm.setTs(date);
 						dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
@@ -418,7 +421,6 @@
 						dockingPreApplyForm.setMsg("淇敼锛�" + msg);
 						dockingPreApplyForm.setContent("");
 						dockingPreApplyForm.setGroupCode("");
-						Date date = new Date();
 						dockingPreApplyForm.setCreateTime(date);
 						dockingPreApplyForm.setLastModifyTime(date);
 						dockingPreApplyForm.setTs(date);

--
Gitblit v1.9.3