From 53c78787926cebd26c4e563ecb27441d539bfe88 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 25 十二月 2023 16:36:24 +0800
Subject: [PATCH] 优化代码

---
 service-oa/src/main/java/com/java110/oa/cmd/workCopy/UpdateWorkCopyCmd.java      |    4 +
 service-oa/src/main/java/com/java110/oa/cmd/workEvent/UpdateWorkEventCmd.java    |    4 +
 service-oa/src/main/java/com/java110/oa/cmd/workCycle/UpdateWorkCycleCmd.java    |    4 +
 service-oa/src/main/java/com/java110/oa/cmd/workCopy/SaveWorkCopyCmd.java        |    9 ++
 service-oa/src/main/java/com/java110/oa/cmd/workType/UpdateWorkTypeCmd.java      |    4 +
 service-oa/src/main/java/com/java110/oa/cmd/workTask/DeleteWorkTaskCmd.java      |    4 +
 service-oa/src/main/java/com/java110/oa/cmd/workCopy/ListWorkCopyCmd.java        |    3 +
 service-oa/src/main/java/com/java110/oa/cmd/workTask/ListWorkTaskCmd.java        |    3 +
 service-oa/src/main/java/com/java110/oa/cmd/workTask/SaveWorkTaskCmd.java        |    5 +
 service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolFileCmd.java    |    3 +
 service-oa/src/main/java/com/java110/oa/cmd/workPool/SaveWorkPoolCmd.java        |    4 +
 service-oa/src/main/java/com/java110/oa/cmd/workEvent/ListWorkEventCmd.java      |    3 +
 service-oa/src/main/java/com/java110/oa/cmd/workType/ListWorkTypeCmd.java        |    3 +
 service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolContentCmd.java |    3 +
 service-oa/src/main/java/com/java110/oa/cmd/workPool/UpdateWorkPoolCmd.java      |    4 +
 java110-bean/src/main/java/com/java110/po/workCopy/WorkCopyPo.java               |   64 +++++++++++++--------
 service-oa/src/main/java/com/java110/oa/cmd/workCycle/SaveWorkCycleCmd.java      |    5 +
 service-oa/src/main/java/com/java110/oa/cmd/workType/SaveWorkTypeCmd.java        |    4 +
 service-oa/src/main/java/com/java110/oa/cmd/workCopy/DeleteWorkCopyCmd.java      |    8 ++
 service-oa/src/main/java/com/java110/oa/cmd/workCycle/ListWorkCycleCmd.java      |    3 +
 service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolCmd.java        |    3 +
 service-oa/src/main/java/com/java110/oa/cmd/workPool/DeleteWorkPoolCmd.java      |    4 +
 service-oa/src/main/java/com/java110/oa/cmd/workTask/UpdateWorkTaskCmd.java      |    4 +
 service-oa/src/main/java/com/java110/oa/cmd/workEvent/DeleteWorkEventCmd.java    |    4 +
 service-oa/src/main/java/com/java110/oa/cmd/workType/DeleteWorkTypeCmd.java      |    5 +
 service-oa/src/main/java/com/java110/oa/cmd/workEvent/SaveWorkEventCmd.java      |    4 +
 service-oa/src/main/java/com/java110/oa/cmd/workCycle/DeleteWorkCycleCmd.java    |    4 +
 27 files changed, 126 insertions(+), 46 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/po/workCopy/WorkCopyPo.java b/java110-bean/src/main/java/com/java110/po/workCopy/WorkCopyPo.java
index f32c66d..2381a7c 100644
--- a/java110-bean/src/main/java/com/java110/po/workCopy/WorkCopyPo.java
+++ b/java110-bean/src/main/java/com/java110/po/workCopy/WorkCopyPo.java
@@ -17,6 +17,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 绫昏〃杩帮細 Po 鏁版嵁妯″瀷瀹炰綋瀵硅薄 鍩烘湰淇濇寔涓庢暟鎹簱妯″瀷涓�鐩� 鐢ㄤ簬 澧炲姞淇敼鍒犻櫎 绛夋椂鐨勬暟鎹浇浣�
  * add by 鍚村鏂� at 2023-12-25 16:18:32 mail: 928255095@qq.com
@@ -28,62 +29,77 @@
 public class WorkCopyPo implements Serializable {
 
     private String copyId;
-private String staffName;
-private String statusCd = "0";
-private String state;
-private String communityId;
-private String storeId;
-private String workId;
-private String staffId;
-public String getCopyId() {
+    private String staffName;
+    private String statusCd = "0";
+    private String state;
+    private String communityId;
+    private String storeId;
+    private String workId;
+    private String staffId;
+
+    public String getCopyId() {
         return copyId;
     }
-public void setCopyId(String copyId) {
+
+    public void setCopyId(String copyId) {
         this.copyId = copyId;
     }
-public String getStaffName() {
+
+    public String getStaffName() {
         return staffName;
     }
-public void setStaffName(String staffName) {
+
+    public void setStaffName(String staffName) {
         this.staffName = staffName;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getWorkId() {
+
+    public String getWorkId() {
         return workId;
     }
-public void setWorkId(String workId) {
+
+    public void setWorkId(String workId) {
         this.workId = workId;
     }
-public String getStaffId() {
+
+    public String getStaffId() {
         return staffId;
     }
-public void setStaffId(String staffId) {
+
+    public void setStaffId(String staffId) {
         this.staffId = staffId;
     }
-
 
 
 }
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workCopy/DeleteWorkCopyCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workCopy/DeleteWorkCopyCmd.java
index 6b4632f..d82b76b 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workCopy/DeleteWorkCopyCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workCopy/DeleteWorkCopyCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -49,16 +50,21 @@
     @Autowired
     private IWorkCopyV1InnerServiceSMO workCopyV1InnerServiceSMOImpl;
 
+
+
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "copyId", "copyId涓嶈兘涓虹┖");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
+
         WorkCopyPo workCopyPo = BeanConvertUtil.covertBean(reqJson, WorkCopyPo.class);
         int flag = workCopyV1InnerServiceSMOImpl.deleteWorkCopy(workCopyPo);
 
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workCopy/ListWorkCopyCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workCopy/ListWorkCopyCmd.java
index e336d07..a05b922 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workCopy/ListWorkCopyCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workCopy/ListWorkCopyCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -58,6 +59,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workCopy/SaveWorkCopyCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workCopy/SaveWorkCopyCmd.java
index c51b9a6..7cd8173 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workCopy/SaveWorkCopyCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workCopy/SaveWorkCopyCmd.java
@@ -18,11 +18,13 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.oa.IWorkCopyV1InnerServiceSMO;
+import com.java110.intf.store.IStoreV1InnerServiceSMO;
 import com.java110.po.workCopy.WorkCopyPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -52,21 +54,24 @@
     @Autowired
     private IWorkCopyV1InnerServiceSMO workCopyV1InnerServiceSMOImpl;
 
+
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "workId", "璇锋眰鎶ユ枃涓湭鍖呭惈workId");
         Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
-        Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId");
         Assert.hasKeyAndValue(reqJson, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈staffId");
         Assert.hasKeyAndValue(reqJson, "staffName", "璇锋眰鎶ユ枃涓湭鍖呭惈staffName");
         Assert.hasKeyAndValue(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
+
         WorkCopyPo workCopyPo = BeanConvertUtil.covertBean(reqJson, WorkCopyPo.class);
         workCopyPo.setCopyId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         int flag = workCopyV1InnerServiceSMOImpl.saveWorkCopy(workCopyPo);
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workCopy/UpdateWorkCopyCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workCopy/UpdateWorkCopyCmd.java
index 3fb0422..5f4af6f 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workCopy/UpdateWorkCopyCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workCopy/UpdateWorkCopyCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -55,7 +56,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "copyId", "copyId涓嶈兘涓虹┖");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workCycle/DeleteWorkCycleCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workCycle/DeleteWorkCycleCmd.java
index 8e2d339..d2411fa 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workCycle/DeleteWorkCycleCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workCycle/DeleteWorkCycleCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -52,7 +53,8 @@
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "cycleId", "cycleId涓嶈兘涓虹┖");
 Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workCycle/ListWorkCycleCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workCycle/ListWorkCycleCmd.java
index 0d97ef6..18befbd 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workCycle/ListWorkCycleCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workCycle/ListWorkCycleCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -58,6 +59,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workCycle/SaveWorkCycleCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workCycle/SaveWorkCycleCmd.java
index c6008cc..a327551 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workCycle/SaveWorkCycleCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workCycle/SaveWorkCycleCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -56,7 +57,6 @@
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "workId", "璇锋眰鎶ユ枃涓湭鍖呭惈workId");
 Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
-Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId");
 Assert.hasKeyAndValue(reqJson, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈staffId");
 Assert.hasKeyAndValue(reqJson, "staffName", "璇锋眰鎶ユ枃涓湭鍖呭惈staffName");
 Assert.hasKeyAndValue(reqJson, "workCycle", "璇锋眰鎶ユ枃涓湭鍖呭惈workCycle");
@@ -64,7 +64,8 @@
 Assert.hasKeyAndValue(reqJson, "cycleEndTime", "璇锋眰鎶ユ枃涓湭鍖呭惈cycleEndTime");
 Assert.hasKeyAndValue(reqJson, "beforeTime", "璇锋眰鎶ユ枃涓湭鍖呭惈beforeTime");
 Assert.hasKeyAndValue(reqJson, "period", "璇锋眰鎶ユ枃涓湭鍖呭惈period");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workCycle/UpdateWorkCycleCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workCycle/UpdateWorkCycleCmd.java
index fbe13bf..29099fe 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workCycle/UpdateWorkCycleCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workCycle/UpdateWorkCycleCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -56,7 +57,8 @@
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "cycleId", "cycleId涓嶈兘涓虹┖");
 Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workEvent/DeleteWorkEventCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workEvent/DeleteWorkEventCmd.java
index 6749194..92bbf98 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workEvent/DeleteWorkEventCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workEvent/DeleteWorkEventCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -52,7 +53,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "eventId", "eventId涓嶈兘涓虹┖");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workEvent/ListWorkEventCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workEvent/ListWorkEventCmd.java
index 02d746d..0ce34a6 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workEvent/ListWorkEventCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workEvent/ListWorkEventCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -58,6 +59,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workEvent/SaveWorkEventCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workEvent/SaveWorkEventCmd.java
index 6ed81ec..2c48010 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workEvent/SaveWorkEventCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workEvent/SaveWorkEventCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -62,7 +63,8 @@
         Assert.hasKeyAndValue(reqJson, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈staffId");
         Assert.hasKeyAndValue(reqJson, "staffName", "璇锋眰鎶ユ枃涓湭鍖呭惈staffName");
         Assert.hasKeyAndValue(reqJson, "remark", "璇锋眰鎶ユ枃涓湭鍖呭惈remark");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workEvent/UpdateWorkEventCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workEvent/UpdateWorkEventCmd.java
index 6f942f5..27d69fb 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workEvent/UpdateWorkEventCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workEvent/UpdateWorkEventCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -55,7 +56,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "eventId", "eventId涓嶈兘涓虹┖");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workPool/DeleteWorkPoolCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workPool/DeleteWorkPoolCmd.java
index c72276e..f6388d5 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workPool/DeleteWorkPoolCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workPool/DeleteWorkPoolCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -51,7 +52,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "workId", "workId涓嶈兘涓虹┖");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolCmd.java
index a8f313c..bc36ab7 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -58,6 +59,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolContentCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolContentCmd.java
index 7f1860e..a59b17f 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolContentCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolContentCmd.java
@@ -17,6 +17,7 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -54,6 +55,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolFileCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolFileCmd.java
index 843ee2b..b135479 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolFileCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workPool/ListWorkPoolFileCmd.java
@@ -17,6 +17,7 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -54,6 +55,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workPool/SaveWorkPoolCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workPool/SaveWorkPoolCmd.java
index 8512236..9f1cfa7 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workPool/SaveWorkPoolCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workPool/SaveWorkPoolCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -60,7 +61,8 @@
         Assert.hasKeyAndValue(reqJson, "workCycle", "璇锋眰鎶ユ枃涓湭鍖呭惈workCycle");
         Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
         Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈endTime");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workPool/UpdateWorkPoolCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workPool/UpdateWorkPoolCmd.java
index caed764..93a41c0 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workPool/UpdateWorkPoolCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workPool/UpdateWorkPoolCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -55,7 +56,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "workId", "workId涓嶈兘涓虹┖");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workTask/DeleteWorkTaskCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workTask/DeleteWorkTaskCmd.java
index 05cfb78..8935fcb 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workTask/DeleteWorkTaskCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workTask/DeleteWorkTaskCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -51,7 +52,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "taskId", "taskId涓嶈兘涓虹┖");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workTask/ListWorkTaskCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workTask/ListWorkTaskCmd.java
index 872371f..e19d978 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workTask/ListWorkTaskCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workTask/ListWorkTaskCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -58,6 +59,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workTask/SaveWorkTaskCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workTask/SaveWorkTaskCmd.java
index 261c52b..742d421 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workTask/SaveWorkTaskCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workTask/SaveWorkTaskCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -56,12 +57,12 @@
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "workId", "璇锋眰鎶ユ枃涓湭鍖呭惈workId");
         Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
-        Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId");
         Assert.hasKeyAndValue(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state");
         Assert.hasKeyAndValue(reqJson, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈staffId");
         Assert.hasKeyAndValue(reqJson, "staffName", "璇锋眰鎶ユ枃涓湭鍖呭惈staffName");
         Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workTask/UpdateWorkTaskCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workTask/UpdateWorkTaskCmd.java
index d8bb9c6..38b73a6 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workTask/UpdateWorkTaskCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workTask/UpdateWorkTaskCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -55,7 +56,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "taskId", "taskId涓嶈兘涓虹┖");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workType/DeleteWorkTypeCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workType/DeleteWorkTypeCmd.java
index bfc6340..8c61ad8 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workType/DeleteWorkTypeCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workType/DeleteWorkTypeCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -51,8 +52,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "wtId", "wtId涓嶈兘涓虹┖");
-        Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workType/ListWorkTypeCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workType/ListWorkTypeCmd.java
index 70a141e..a26e313 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workType/ListWorkTypeCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workType/ListWorkTypeCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -58,6 +59,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workType/SaveWorkTypeCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workType/SaveWorkTypeCmd.java
index 9b534af..8385d40 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workType/SaveWorkTypeCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workType/SaveWorkTypeCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -57,7 +58,8 @@
         Assert.hasKeyAndValue(reqJson, "typeName", "璇锋眰鎶ユ枃涓湭鍖呭惈typeName");
         Assert.hasKeyAndValue(reqJson, "timeout", "璇锋眰鎶ユ枃涓湭鍖呭惈timeout");
         Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/workType/UpdateWorkTypeCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/workType/UpdateWorkTypeCmd.java
index 2c9e54d..c60d433 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/workType/UpdateWorkTypeCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/workType/UpdateWorkTypeCmd.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -55,7 +56,8 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "wtId", "wtId涓嶈兘涓虹┖");
-
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId",storeId);
     }
 
     @Override

--
Gitblit v1.8.0