Forráskód Böngészése

修改系统分类接口

syh 5 éve
szülő
commit
21e3b670cc

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import cn.com.ctop.common.module.service.ISysRoleService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
@@ -35,7 +36,9 @@ public class PangolinController {
     @Autowired
     private ISysRoleService sysRoleService;
     @Autowired
-    private IUserAllocationService  userAllocationService;
+    private IBindAccountLoginService bindAccountLoginService;
+    @Autowired
+    private IUserAllocationService userAllocationService;
     @PostMapping("api/user/list")
     public Map<String, Object> userList(@RequestBody JSONObject data) {
 //        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -45,6 +48,7 @@ public class PangolinController {
         if(null!=roleCode&&(roleCode.equals("admin"))){
             userId = null;
         }
+
         return userAllocationService.getPangolinAccountListByParams(userId,data);
     }
 

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -182,10 +182,10 @@ public class ProjectController {
             queryWrapper.eq("user_id", sysUser.getId());
             queryWrapper.orderByDesc("create_time");
         }
-        if(null!=industryId&&"".equals(industryId.trim())){
+        if(null!=industryId&&!"".equals(industryId.trim())){
             SysCategory category = sysCategoryService.getById(industryId);
             if(null!=category){
-                queryWrapper.likeLeft("industry_code",category.getCode());
+                queryWrapper.likeRight("industry_code",category.getCode());
             }
         }
         IPage<Project> pageList = projectService.page(page, queryWrapper);

+ 2 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceReportController.java

@@ -130,7 +130,6 @@ public class BytedanceReportController {
             result.error500("开始时间和结束时间不能为空");
             return result;
         }
-
         try {
             log.info("头条获取素材报表数据任务执行开始");
             Long starttime = System.currentTimeMillis();
@@ -146,7 +145,8 @@ public class BytedanceReportController {
                     @Override
                     public void run() {
                         try {
-                            Long days = DateUtils.getDiscrepantDays(startDate, endDate); //间隔天数
+                            //间隔天数
+                            Long days = DateUtils.getDiscrepantDays(startDate, endDate);
                             String start = null;
                             String end = null;
                             for (int i = 0; i <= days; i++) {