wuxw před 6 roky
rodič
revize
69e2baf551

+ 2 - 0
Api/src/main/java/com/java110/api/listener/activities/SaveActivitiesListener.java

@@ -40,6 +40,8 @@ public class SaveActivitiesListener extends AbstractServiceApiListener {
         Assert.hasKeyAndValue(reqJson, "context", "必填,请填写活动内容");
         Assert.hasKeyAndValue(reqJson, "startTime", "必填,请选择开始时间");
         Assert.hasKeyAndValue(reqJson, "endTime", "必填,请选择结束时间");
+        Assert.hasKeyAndValue(reqJson, "userId", "必填,请填写用户ID");
+        Assert.hasKeyAndValue(reqJson, "userName", "必填,请填写用户名称");
 
     }
 

+ 4 - 2
WebService/src/main/java/com/java110/web/smo/activities/impl/AddActivitiesSMOImpl.java

@@ -3,6 +3,7 @@ package com.java110.web.smo.activities.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.AbstractComponentSMO;
 import com.java110.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
 import com.java110.web.smo.activities.IAddActivitiesSMO;
@@ -13,7 +14,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 
-
 /**
  * 添加小区服务实现类
  * add by wuxw 2019-06-30
@@ -43,7 +43,9 @@ public class AddActivitiesSMOImpl extends AbstractComponentSMO implements IAddAc
     @Override
     protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
         ResponseEntity<String> responseEntity = null;
-        super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        paramIn.put("userId", result.getUserId());
+        paramIn.put("userName", result.getUserName());
 
         responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                 ServiceConstant.SERVICE_API_URL + "/api/activities.saveActivities",

+ 1 - 1
WebService/src/main/resources/components/activitiesPackage/activities-manage/activitiesManage.html

@@ -50,7 +50,7 @@
             </div>
         </div>
     </div>
-    <div class="row">
+    <div class="row" v-bind:class="{no_display:activitiesManageInfo.componentShow != 'activitiesList'}">
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">