|
@@ -169,14 +169,14 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
default: break;
|
|
|
}
|
|
|
queryWrapper.orderByDesc("sub_date").eq("farm_id",farmId);
|
|
|
- List<BaseLocation> baseLocations = baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().eq("serial_number", 0));
|
|
|
- List<Integer> locationIds = new ArrayList<>();
|
|
|
- for (BaseLocation baseLocation : baseLocations) {
|
|
|
- locationIds.add(baseLocation.getId());
|
|
|
- }
|
|
|
- if (!locationIds.contains(Integer.parseInt(TokenSign.getWorkIdByJwtToken(httpServletRequest)))){
|
|
|
- queryWrapper.eq("id",0);
|
|
|
- }
|
|
|
+// List<BaseLocation> baseLocations = baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().eq("serial_number", 0));
|
|
|
+// List<Integer> locationIds = new ArrayList<>();
|
|
|
+// for (BaseLocation baseLocation : baseLocations) {
|
|
|
+// locationIds.add(baseLocation.getId());
|
|
|
+// }
|
|
|
+// if (!locationIds.contains(Integer.parseInt(TokenSign.getWorkIdByJwtToken(httpServletRequest)))){
|
|
|
+// queryWrapper.eq("id",0);
|
|
|
+// }
|
|
|
Page<BillPersonnelAdmission> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
|
|
|
Page<BillPersonnelAdmission> billPersonnelAdmissionPage = billPersonnelAdmissionMapper.selectPage(page,queryWrapper);
|
|
|
return new Result(ResultCode.SUCCESS,billPersonnelAdmissionPage);
|