From c9d10841129fa0c8d6589854ee3ff53680f0204b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 11 十一月 2024 15:25:26 +0800
Subject: [PATCH] 优化代码
---
service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java | 5 ++++-
service-oa/src/main/java/com/java110/oa/cmd/work/UpdateWorkPoolCmd.java | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java
index a23d8a4..cbcef6e 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java
@@ -106,7 +106,6 @@
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯");
Assert.hasKeyAndValue(reqJson, "wtId", "璇锋眰鎶ユ枃涓湭鍖呭惈宸ヤ綔绫诲瀷");
- Assert.hasKeyAndValue(reqJson, "workName", "璇锋眰鎶ユ枃涓湭鍖呭惈鏍囬");
Assert.hasKeyAndValue(reqJson, "workCycle", "璇锋眰鎶ユ枃涓湭鍖呭惈宸ュ崟鏍囪瘑");
Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈寮�濮嬫椂闂�");
Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈瀹屾垚鏃堕棿");
@@ -158,6 +157,10 @@
userDto.setUserId(userId);
List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
Assert.listOnlyOne(userDtos, "鐢ㄦ埛鏈櫥褰�");
+ String workName = reqJson.getString("workName");
+ if(StringUtil.isEmpty(workName)){
+ reqJson.put("workName",userDtos.get(0).getName()+"鍙戣捣鐨勫伐浣滃崟");
+ }
WorkPoolPo workPoolPo = BeanConvertUtil.covertBean(reqJson, WorkPoolPo.class);
workPoolPo.setWorkId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
workPoolPo.setCreateUserId(userDtos.get(0).getUserId());
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/work/UpdateWorkPoolCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/work/UpdateWorkPoolCmd.java
index eef7eb0..1ab8b04 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/work/UpdateWorkPoolCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/work/UpdateWorkPoolCmd.java
@@ -82,7 +82,6 @@
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "workId", "workId涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "wtId", "璇锋眰鎶ユ枃涓湭鍖呭惈wtId");
- Assert.hasKeyAndValue(reqJson, "workName", "璇锋眰鎶ユ枃涓湭鍖呭惈workName");
Assert.hasKeyAndValue(reqJson, "workCycle", "璇锋眰鎶ユ枃涓湭鍖呭惈workCycle");
Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈endTime");
@@ -152,6 +151,11 @@
Assert.listOnlyOne(userDtos, "鐢ㄦ埛鏈櫥褰�");
+ String workName = reqJson.getString("workName");
+ if(StringUtil.isEmpty(workName)){
+ reqJson.put("workName",userDtos.get(0).getName()+"鍙戣捣鐨勫伐浣滃崟");
+ }
+
WorkPoolPo workPoolPo = BeanConvertUtil.covertBean(reqJson, WorkPoolPo.class);
int flag = workPoolV1InnerServiceSMOImpl.updateWorkPool(workPoolPo);
--
Gitblit v1.8.0