Browse Source

结算单-未上传账户数据

yangzian 3 năm trước cách đây
mục cha
commit
071a93b64f

+ 6 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyInfoServiceImpl.java

@@ -293,6 +293,11 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
        //查询账户数量
        List<String>accountIds = reportSettlementService.getAccountId(paramsVo,user);
 
+       if (Check.isNull(accountIds)){
+           return Result.errorMsg("未上传结算单账户列表查询为空。");
+       }
+
+
        //过滤消耗为0 的账户 1-头条 2-快手
        if (paramsVo.getMediaId().equals(1)){
            accountIds = reportSettlementMapper.getAccountIdBytedanceRepeat(accountIds,paramsVo.getUploadYears());
@@ -303,9 +308,7 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
        //过滤以上传的账户
        //List<JSONObject> list = policyInfoMapper.getSettlementNoPictureAccountList(productId,projectId,uploadYears,mediaIds);
 
-       if (Check.isNull(accountIds)){
-           return Result.errorMsg("未上传结算单账户列表查询为空。");
-       }
+
 
        PageHelper.startPage(paramsVo.getPageNo(), paramsVo.getPageSize());
        List<JSONObject> list = policyInfoMapper.getSettlementNoPictureAccountAgentList(paramsVo.getProductId(),paramsVo.getProjectId(),paramsVo.getUploadYears(),accountIds);