yumeng 3 年之前
父节点
当前提交
26d31ada8d

+ 10 - 8
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsVideoReportCtrl.java

@@ -12,11 +12,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.AccountReportConstants;
 import org.jeecg.common.system.entity.SysUser;
-import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.utils.JsonResourceUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -94,17 +92,21 @@ public class KsVideoReportCtrl {
             if (Check.isNull(user)) {
                 throw new Exception("用户信息为空");
             }
-            if (!"管理员".equals(user.getRealname()) && !"吴睿刚".equals(user.getRealname())) {
-                UserCompany userCompany = companyService.getByUserId(userId);
-                if (Check.isNull(userCompany)) {
-                    throw new Exception("公司信息为空");
+
+            JSONArray accountIds = requestBody.getJSONArray("accountIds");
+            if (Check.isNull(accountIds)) {
+                if (!"管理员".equals(user.getRealname()) && !"吴睿刚".equals(user.getRealname())) {
+                    UserCompany userCompany = companyService.getByUserId(userId);
+                    if (Check.isNull(userCompany)) {
+                        throw new Exception("公司信息为空");
+                    }
+                    requestMap.put("companyId", userCompany.getCompanyId());
                 }
-                requestMap.put("companyId", userCompany.getCompanyId());
             }
             requestMap.put("filed", filedAll);
             requestMap.put("startDate", startDate);
             requestMap.put("endDate", endDate);
-            if (!Check.isNull(requestBody.getJSONArray("accountIds"))) {
+            if (!Check.isNull(accountIds)) {
                 requestMap.put("accountIds", requestBody.getJSONArray("accountIds"));
             }
             if (!Check.isNull(requestBody.getString("clipId"))) {