|
@@ -194,9 +194,15 @@ public class BaseCameraManagementController extends BaseController {
|
|
lw.eq(BaseCameraManagement::getInstallMile, miles);
|
|
lw.eq(BaseCameraManagement::getInstallMile, miles);
|
|
}
|
|
}
|
|
if(!baseCameraManagementVo.getDsFlay()){
|
|
if(!baseCameraManagementVo.getDsFlay()){
|
|
-// if (!ObjectUtils.isEmpty(baseCameraManagementVo.getDsUserId())){
|
|
|
|
-// lw.eq()
|
|
|
|
-// }
|
|
|
|
|
|
+ if (!ObjectUtils.isEmpty(baseCameraManagementVo.getDsUserId())){
|
|
|
|
+ lw.eq(BaseCameraManagement::getCreateBy, baseCameraManagementVo.getDsUserId()).or();
|
|
|
|
+ }
|
|
|
|
+ if (!ObjectUtils.isEmpty(baseCameraManagementVo.getDsDeptId())){
|
|
|
|
+ lw.eq(BaseCameraManagement::getDeptId,baseCameraManagementVo.getDsDeptId()).or();
|
|
|
|
+ }
|
|
|
|
+ if (!ObjectUtils.isEmpty(baseCameraManagementVo.getDsDeptIds())){
|
|
|
|
+ lw.in(BaseCameraManagement::getDeptId,baseCameraManagementVo.getDsDeptIds());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
IPage<BaseCameraManagement> page = baseCameraManagementService.page(new Page<>(baseCameraManagementVo.getPageNum(), baseCameraManagementVo.getPageSize()), lw);
|
|
IPage<BaseCameraManagement> page = baseCameraManagementService.page(new Page<>(baseCameraManagementVo.getPageNum(), baseCameraManagementVo.getPageSize()), lw);
|
|
if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
|
|
if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
|