|
@@ -72,8 +72,8 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
|
|
|
}else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
|
|
}else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
|
|
|
fids=adminMapper.selectBySuperId(TokenManager.getAdminId());
|
|
fids=adminMapper.selectBySuperId(TokenManager.getAdminId());
|
|
|
}
|
|
}
|
|
|
- params.put("b", newBo);
|
|
|
|
|
params.put("fids", fids);
|
|
params.put("fids", fids);
|
|
|
|
|
+ params.put("b", newBo);
|
|
|
Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("technicianBonusList", "technicianBonusCount", params, pageNo, pageSize);
|
|
Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("technicianBonusList", "technicianBonusCount", params, pageNo, pageSize);
|
|
|
return data;
|
|
return data;
|
|
|
}
|
|
}
|
|
@@ -84,6 +84,14 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
|
|
|
@Override
|
|
@Override
|
|
|
public Pagination<TOrderBonusBo> saleBonusStatistics(TOrderBonusBo newBo, Integer pageNo, Integer pageSize) {
|
|
public Pagination<TOrderBonusBo> saleBonusStatistics(TOrderBonusBo newBo, Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
|
|
+
|
|
|
|
|
+ List<String> fids=new ArrayList<>();
|
|
|
|
|
+ if (TokenManager.hasRole(AFTConstants.FINANCE)) {
|
|
|
|
|
+ newBo.setGrantBy(TokenManager.getAdminId());
|
|
|
|
|
+ }else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
|
|
|
|
|
+ fids=adminMapper.selectBySuperId(TokenManager.getAdminId());
|
|
|
|
|
+ }
|
|
|
|
|
+ params.put("fids", fids);
|
|
|
params.put("b", newBo);
|
|
params.put("b", newBo);
|
|
|
Pagination<TOrderBonusBo> data = (Pagination<TOrderBonusBo>)findPage("saleBonusList", "saleBonusCount", params, pageNo, pageSize);
|
|
Pagination<TOrderBonusBo> data = (Pagination<TOrderBonusBo>)findPage("saleBonusList", "saleBonusCount", params, pageNo, pageSize);
|
|
|
|
|
|