|
|
@@ -1009,7 +1009,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
@Override
|
|
|
public void checkCustomer(Set<CustomerExcelBo> boSet, Set<Integer> existRows, Set<Integer> filterRows) {
|
|
|
List<User> list = null;
|
|
|
- CustomerExcelBo[] bos = (CustomerExcelBo[]) boSet.toArray(new CustomerExcelBo[] {});
|
|
|
+ CustomerExcelBo[] bos = boSet.toArray(new CustomerExcelBo[] {});
|
|
|
for (int i = 0; i < bos.length; i++) {
|
|
|
CustomerExcelBo bo = bos[i];
|
|
|
CustomerExcelBo ceb = null;
|
|
|
@@ -2399,7 +2399,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
if(in.getDepId()!=null)map.put("depId",in.getDepId());
|
|
|
}
|
|
|
map.put("shiroType",in.getShiroType());
|
|
|
- return (Pagination<OutUserMianProducts>) findPage("findMainProductsList","findMainProductsCount",map,in.getPageNo(),in.getPageSize());
|
|
|
+ Pagination<OutUserMianProducts> p=(Pagination<OutUserMianProducts>) findPage("findMainProductsList","findMainProductsCount",map,in.getPageNo(),in.getPageSize());
|
|
|
+ return p;
|
|
|
}
|
|
|
|
|
|
@Override
|