yumeng vor 3 Jahren
Ursprung
Commit
711095543d

+ 15 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/controller/KuaiShouDimensionStrategyController.java

@@ -1,6 +1,7 @@
 package cn.com.ctop.kuaishou.modules.dimension.controller;
 
 import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.service.ISysRoleExtService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.QueryGenerator;
@@ -23,7 +24,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -73,6 +76,8 @@ public class KuaiShouDimensionStrategyController {
     private IKuaiShouDimensionMaterialService dimensionMaterialService;
     @Autowired
     private IKuaiShouAppListService appListService;
+    @Autowired
+    private ISysRoleExtService sysRoleService;
 
 
     @GetMapping(value = "/checkStrategyName")
@@ -176,6 +181,12 @@ public class KuaiShouDimensionStrategyController {
         if (!Check.isNull(strategyName)) {
             queryWrapper.like("strategy_name", strategyName);
         }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String roleCode = sysRoleService.getRoleCodeByUserId(sysUser.getId());
+        if (!roleCode.equals("admin")) {
+            queryWrapper.eq("user_id", sysUser.getId());
+        }
+
         queryWrapper.orderByDesc("create_time");
         Page<KuaiShouDimensionStrategy> page = new Page<KuaiShouDimensionStrategy>(pageNo, pageSize);
         IPage<KuaiShouDimensionStrategy> pageList = kuaiShouDimensionStrategyService.page(page, queryWrapper);
@@ -222,7 +233,10 @@ public class KuaiShouDimensionStrategyController {
                 throw new Exception("策略配置应用不能为空");
             }
 
-            kuaiShouDimensionStrategyService.insertStrategy(strategyJson);
+            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+
+            kuaiShouDimensionStrategyService.insertStrategy(sysUser.getId(), strategyJson);
             result.success("添加成功!");
         } catch (Exception e) {
             log.error(e.getMessage(), e);

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/entity/KuaiShouDimensionStrategy.java

@@ -182,6 +182,7 @@ public class KuaiShouDimensionStrategy {
     @Excel(name = "策略名称", width = 15)
     @ApiModelProperty(value = "策略名称")
     private String strategyName;
+    private String userId;
 
     @TableField(exist = false)
     private JSONArray appInfoArray;

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/service/IKuaiShouDimensionStrategyService.java

@@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IKuaiShouDimensionStrategyService extends IService<KuaiShouDimensionStrategy> {
 
-    void insertStrategy(JSONObject strategyJson);
+    void insertStrategy(String userId, JSONObject strategyJson);
 
     JSONObject create(Long id, JSONArray materialArray);
 }

+ 2 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/service/impl/KuaiShouDimensionStrategyServiceImpl.java

@@ -83,10 +83,11 @@ public class KuaiShouDimensionStrategyServiceImpl extends ServiceImpl<KuaiShouDi
      * @param strategyJson
      */
     @Override
-    public void insertStrategy(JSONObject strategyJson) {
+    public void insertStrategy(String userId, JSONObject strategyJson) {
 
         KuaiShouDimensionStrategy dimensionStrategy = new KuaiShouDimensionStrategy();
 
+        dimensionStrategy.setUserId(userId);
         Long id = strategyJson.getLong("id"); // 主键id
         if (!Check.isNull(id)) {
             dimensionStrategy.setId(id);