Bladeren bron

字段重复

yumeng 5 jaren geleden
bovenliggende
commit
51ebab6155

+ 5 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java

@@ -118,7 +118,7 @@ public class UserAllocationController {
     }
 
     @GetMapping(value = "/getAccountListByProjectId")
-    public Result<List<UserAllocation>> getAccountListByProjectId(Long projectId) {
+    public Result<List<UserAllocation>> getAccountListByProjectId(String userId, Long projectId) {
         Result<List<UserAllocation>> result = new Result<>();
         try {
 
@@ -129,6 +129,10 @@ public class UserAllocationController {
                 queryWrapper.eq("media_id", project.getMediaId());
             }
 
+            String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
+            if (!"admin".equals(roleCode) && !"kuaishouOperationManager".equals(roleCode)) {
+                queryWrapper.eq("user_id", userId);
+            }
             List<UserAllocation> userAllocations = userAllocationMapper.selectList(queryWrapper);
             result.setSuccess(true);
             result.setResult(userAllocations);

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouImageGet.java

@@ -69,7 +69,7 @@ public class KuaiShouImageGet {
     @Excel(name = "图片格式", width = 15)
     @ApiModelProperty(value = "图片格式")
     private String format;
-    private String signature;
+
     /**
      * 图片 token
      */