Commit 9144c2a3 by 邹磊浩

Merge remote-tracking branch 'origin/dev' into dev

parents ea306fa4 c8a3c17f
...@@ -551,7 +551,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { ...@@ -551,7 +551,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
}else if(dataViewBo.getCondition() == 1){ }else if(dataViewBo.getCondition() == 1){
dataViewVo.setDataSum(falseData.get(0).getAdminToday().intValue()); dataViewVo.setDataSum(falseData.get(0).getAdminToday().intValue());
}else { }else {
dataViewVo.setDataSum(falseData.get(0).getAdminSeven().intValue()); dataViewVo.setDataSum(falseData.get(0).getAdminSum().intValue());
} }
//return baseMapper.selectDataView(dataViewBo); //return baseMapper.selectDataView(dataViewBo);
return dataViewVo; return dataViewVo;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment