|
@@ -1,6 +1,7 @@
|
|
package vip.xiaonuo.sale.service.impl;
|
|
package vip.xiaonuo.sale.service.impl;
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
@@ -373,10 +374,13 @@ public class SaleTargetServiceImpl extends ServiceImpl<SaleTargetMapper, SaleTar
|
|
queryWrapper.groupBy("customer_name");
|
|
queryWrapper.groupBy("customer_name");
|
|
Page<SaleTarget> targets = targetMapper.selectPage(page, queryWrapper);
|
|
Page<SaleTarget> targets = targetMapper.selectPage(page, queryWrapper);
|
|
List<SaleTarget> records = targets.getRecords();
|
|
List<SaleTarget> records = targets.getRecords();
|
|
- for (int i = 0; i < pageSize; i++) {
|
|
|
|
- SaleTarget workstopPlan = records.get(i);
|
|
|
|
- workstopPlan.setId((pageNum-1) *pageSize + i+ 1 );
|
|
|
|
|
|
+ if (ObjectUtil.isNotEmpty(records)){
|
|
|
|
+ for (int i = 0; i < pageSize; i++) {
|
|
|
|
+ SaleTarget workstopPlan = records.get(i);
|
|
|
|
+ workstopPlan.setId((pageNum-1) *pageSize + i+ 1 );
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
return targets;
|
|
return targets;
|
|
}
|
|
}
|
|
|
|
|