From 3e3d7f6592d0352e0c4f1f78cdc414a8f5af8112 Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Thu, 9 Jul 2020 14:14:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=AE=B2=E5=9D=9B=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ActivityInfoController.java      | 17 +++++++++--------
 .../service/impl/ActivityInfoServiceImpl.java   |  2 ++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/controller/ActivityInfoController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/controller/ActivityInfoController.java
index 8162446..7f482ed 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/controller/ActivityInfoController.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/controller/ActivityInfoController.java
@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.smile.activity.controller;
 
 import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -46,25 +47,25 @@ import java.util.Map;
 @RestController
 @RequestMapping("activityinfo")
 public class ActivityInfoController {
-    
+
     @Autowired
     private ActivityInfoService activityInfoService;
 
     @GetMapping("page")
-    @DataFilter(tableAlias = "a", isPendingCreator = false, prefix = "AND")
-    public Result<PageData<ActivityInfoDTO>> page(@RequestParam Map<String, Object> params){
+    @DataFilter(tableAlias = "a", userId = FieldConstant.CREATED_BY, prefix = "AND")
+    public Result<PageData<ActivityInfoDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<ActivityInfoDTO> page = activityInfoService.page(params);
         return new Result<PageData<ActivityInfoDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<ActivityInfoDTO> get(@PathVariable("id") String id){
+    public Result<ActivityInfoDTO> get(@PathVariable("id") String id) {
         ActivityInfoDTO data = activityInfoService.get(id);
         return new Result<ActivityInfoDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody ActivityInfoDTO dto){
+    public Result save(@RequestBody ActivityInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         activityInfoService.save(dto);
@@ -72,7 +73,7 @@ public class ActivityInfoController {
     }
 
     @PutMapping
-    public Result update(@RequestBody ActivityInfoDTO dto){
+    public Result update(@RequestBody ActivityInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         activityInfoService.update(dto);
@@ -80,7 +81,7 @@ public class ActivityInfoController {
     }
 
     @PostMapping("cancel")
-    public Result cancel(@RequestBody ActivityInfoDTO dto){
+    public Result cancel(@RequestBody ActivityInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         activityInfoService.update(dto);
@@ -88,7 +89,7 @@ public class ActivityInfoController {
     }
 
     @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         activityInfoService.delete(ids);
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/service/impl/ActivityInfoServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/service/impl/ActivityInfoServiceImpl.java
index 6a905b6..1cb847b 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/service/impl/ActivityInfoServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/service/impl/ActivityInfoServiceImpl.java
@@ -24,6 +24,7 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.smile.dto.activity.ActivityInfoDTO;
 import com.elink.esua.epdc.smile.dto.activity.form.ActivityDetailFormDTO;
@@ -104,6 +105,7 @@ public class ActivityInfoServiceImpl extends BaseServiceImpl<ActivityInfoDao, Ac
         entity.setCategoryCode(sectionCategoryEntity.getCode());
         entity.setCategoryName(sectionCategoryEntity.getName());
         entity.setSectionCode(sectionCategoryEntity.getSectionCode());
+        entity.setDeptId(SecurityUser.getDeptId());
         insert(entity);
     }