yumeng 3 år sedan
förälder
incheckning
d00f806e07

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

@@ -89,7 +89,6 @@ public class KsVideoReportCtrl {
                 }
                 requestMap.put("companyId", userCompany.getCompanyId());
             }
-
             requestMap.put("filed", filedAll);
             requestMap.put("startDate", startDate);
             requestMap.put("endDate", endDate);
@@ -114,8 +113,8 @@ public class KsVideoReportCtrl {
             if (!Check.isNull(requestBody.getString("order"))) {
                 requestMap.put("order", requestBody.getString("order"));
             }
-            if (!Check.isNull(requestBody.getInteger("channelType"))) {
-                requestMap.put("channelType", requestBody.getInteger("channelType"));
+            if (!Check.isNull(requestBody.getString("channelType"))) {
+                requestMap.put("channelType", requestBody.getString("channelType"));
             }
             PageInfo<JSONObject> listData = ksVideoReportService.getKuaiShouVideoPageReportByMap(requestMap, pageSize, pageNo);
             if (Check.isNull(listData)) {
@@ -210,8 +209,8 @@ public class KsVideoReportCtrl {
             if (!Check.isNull(requestBody.getString("order"))) {
                 requestMap.put("order", requestBody.getString("order"));
             }
-            if (!Check.isNull(requestBody.getInteger("channelType"))) {
-                requestMap.put("channelType", requestBody.getInteger("channelType"));
+            if (!Check.isNull(requestBody.getString("channelType"))) {
+                requestMap.put("channelType", requestBody.getString("channelType"));
             }
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             String realname = sysUser.getRealname();

+ 3 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KsVideoReportMapper.xml

@@ -101,7 +101,9 @@
         <if test="shotId !=null and shotId != ''">
             AND t2.shot_id = #{shotId}
         </if>
-
+        <if test="companyId !=null and companyId != ''">
+            AND t2.company_id = #{companyId}
+        </if>
 
     </select>