diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java index cb4fc9fb..ff1626f2 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java @@ -30,10 +30,10 @@ public class BgWorkTrainController extends BaseController { public TableDataInfo getWorkTrainList(String trainType,String deptId,String projectId){ WorkTrain workTrain = new WorkTrain(); workTrain.setTrainType(trainType); - if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){ + if(deptId!=null && !"0".equals(deptId)){ workTrain.setNowDept(deptId); } - if(projectId!=null && !"undefined".equals(projectId) && !"0".equals(projectId)){ + if(projectId!=null && !"0".equals(projectId)){ workTrain.setProjectId(Convert.toLong(projectId)); } return getDataTable(workTrainService.selectBgscreenWorkTrainListv2(workTrain)); diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java index c9a10918..f3128588 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java @@ -38,10 +38,10 @@ public class ProjectAttendanceController extends BaseController { @GetMapping("/getDeptWorksList") public TableDataInfo getDeptWorksList(String deptId,String projectId){ SurProjectDeptWroks surProjectDeptWroks = new SurProjectDeptWroks(); - if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){ + if(deptId!=null && !"0".equals(deptId)){ surProjectDeptWroks.setDeptId(Convert.toLong(deptId)); } - if(projectId!=null && !"undefined".equals(projectId) && !"0".equals(projectId)){ + if(projectId!=null && !"0".equals(projectId)){ surProjectDeptWroks.setProjectId(Convert.toLong(projectId)); } return getDataTable(surProjectDeptWroksService.selectBgscreenDeptWroksList(surProjectDeptWroks)); @@ -57,10 +57,10 @@ public class ProjectAttendanceController extends BaseController { @GetMapping("/getWorkAttendanceList") public TableDataInfo getWorkAttendanceList(String deptId,String projectId,String date){ SurProjectWorkAttendance surProjectWorkAttendance = new SurProjectWorkAttendance(); - if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){ + if(deptId!=null && !"0".equals(deptId)){ surProjectWorkAttendance.setDeptId(Convert.toLong(deptId)); } - if(projectId!=null && !"undefined".equals(projectId) && !"0".equals(projectId)){ + if(projectId!=null && !"0".equals(projectId)){ surProjectWorkAttendance.setProjectId(Convert.toLong(projectId)); } if(StringUtils.isNotBlank(date)){ diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectInsuranceController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectInsuranceController.java index 7316dd59..e4764a9b 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectInsuranceController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectInsuranceController.java @@ -30,10 +30,10 @@ public class ProjectInsuranceController extends BaseController { @GetMapping("/getProjectInsuranceList") public TableDataInfo getProjectInsuranceList(String deptId,String projectId){ SurProjectInsurance surProjectInsurance = new SurProjectInsurance(); - if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){ + if(deptId!=null && !"0".equals(deptId)){ surProjectInsurance.setNowDept(deptId); } - if(projectId!=null && !"undefined".equals(projectId) && !"0".equals(projectId)){ + if(projectId!=null && !"0".equals(projectId)){ surProjectInsurance.setProjectId(Convert.toLong(projectId)); } return getDataTable(surProjectInsuranceService.selectBgscreenInsuranceList(surProjectInsurance)); diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectSpecialController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectSpecialController.java index 7b4d6bd3..cf0fc7f5 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectSpecialController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectSpecialController.java @@ -31,10 +31,10 @@ public class ProjectSpecialController extends BaseController { @GetMapping("/getProjectSpecialView") public TableDataInfo getProjectSpecialView(String deptId,String projectId){ SurProjectWorkSpecial surProjectWorkSpecial = new SurProjectWorkSpecial(); - if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){ + if(deptId!=null && !"0".equals(deptId)){ surProjectWorkSpecial.setNowDept(deptId); } - if(projectId!=null && !"undefined".equals(projectId) && !"0".equals(projectId)){ + if(projectId!=null && !"0".equals(projectId)){ surProjectWorkSpecial.setProjectId(Convert.toLong(projectId)); } return getDataTable(surProjectWorkSpecialService.selectBgscreenWorkSpecialList(surProjectWorkSpecial));