|
@@ -785,7 +785,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
list.add(commonRoleService.selectById(commonStaffRole.getRoleId()));
|
|
list.add(commonRoleService.selectById(commonStaffRole.getRoleId()));
|
|
}
|
|
}
|
|
for(CommonRole commonRole : list){
|
|
for(CommonRole commonRole : list){
|
|
- if(commonRole.getRoleName().equals("决策人") || commonRole.getRoleName().equals("系统管理员")|| commonRole.getRoleName().contains("总")){
|
|
|
|
|
|
+ if(commonRole.getRoleName().equals("决策人") || commonRole.getRoleName().equals("财务")|| commonRole.getRoleName().equals("出纳")|| commonRole.getRoleName().equals("系统管理员")|| commonRole.getRoleName().contains("总")){
|
|
List<WarehouseBaseInfo> warehouseBaseInfoList1 = this.selectList(new EntityWrapper<WarehouseBaseInfo>()
|
|
List<WarehouseBaseInfo> warehouseBaseInfoList1 = this.selectList(new EntityWrapper<WarehouseBaseInfo>()
|
|
.eq("comp_id", compId)
|
|
.eq("comp_id", compId)
|
|
.eq("warehouse_type","1")
|
|
.eq("warehouse_type","1")
|