From 46dc8626f31efaf5e057dd0fa87a03acd303aef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Fri, 18 Aug 2023 00:18:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/project/surProjectSchedule/index.vue | 2 +- ruoyi-ui/src/views/trouble/pshMarks/index.vue | 2 +- ruoyi-ui/src/views/trouble/sspMarks/index.vue | 2 +- ruoyi-ui/src/views/work/workFile/index.vue | 2 +- .../bigscreen/web/controller/BgWorkTrainController.java | 4 ++-- .../web/controller/ProjectAttendanceController.java | 8 ++++---- .../web/controller/ProjectInsuranceController.java | 4 ++-- .../web/controller/ProjectSpecialController.java | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ruoyi-ui/src/views/project/surProjectSchedule/index.vue b/ruoyi-ui/src/views/project/surProjectSchedule/index.vue index f74e6045..8015151a 100644 --- a/ruoyi-ui/src/views/project/surProjectSchedule/index.vue +++ b/ruoyi-ui/src/views/project/surProjectSchedule/index.vue @@ -200,7 +200,7 @@ /> diff --git a/ruoyi-ui/src/views/trouble/sspMarks/index.vue b/ruoyi-ui/src/views/trouble/sspMarks/index.vue index 2f61c0b0..aed87d2b 100644 --- a/ruoyi-ui/src/views/trouble/sspMarks/index.vue +++ b/ruoyi-ui/src/views/trouble/sspMarks/index.vue @@ -94,7 +94,7 @@ diff --git a/ruoyi-ui/src/views/work/workFile/index.vue b/ruoyi-ui/src/views/work/workFile/index.vue index 6a0ef1ec..c736e2e0 100644 --- a/ruoyi-ui/src/views/work/workFile/index.vue +++ b/ruoyi-ui/src/views/work/workFile/index.vue @@ -118,7 +118,7 @@ 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 79646846..cb4fc9fb 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(StringUtils.isNotBlank(deptId) && !"0".equals(deptId) && !"undefined".equals(deptId)){ + if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){ workTrain.setNowDept(deptId); } - if(StringUtils.isNotBlank(projectId) && !"0".equals(projectId) && !"undefined".equals(projectId)){ + if(projectId!=null && !"undefined".equals(projectId) && !"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 b2c772ae..c9a10918 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(StringUtils.isNotBlank(deptId) && !"0".equals(deptId) && !"undefined".equals(deptId)){ + if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){ surProjectDeptWroks.setDeptId(Convert.toLong(deptId)); } - if(StringUtils.isNotBlank(projectId) && !"0".equals(projectId) && !"undefined".equals(projectId)){ + if(projectId!=null && !"undefined".equals(projectId) && !"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(StringUtils.isNotBlank(deptId) && !"0".equals(deptId) && !"undefined".equals(deptId)){ + if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){ surProjectWorkAttendance.setDeptId(Convert.toLong(deptId)); } - if(StringUtils.isNotBlank(projectId) && !"0".equals(projectId) && !"undefined".equals(projectId)){ + if(projectId!=null && !"undefined".equals(projectId) && !"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 5d1969ba..7316dd59 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(StringUtils.isNotBlank(deptId) && !"0".equals(deptId) && !"undefined".equals(deptId)){ + if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){ surProjectInsurance.setNowDept(deptId); } - if(StringUtils.isNotBlank(projectId) && !"0".equals(projectId) && !"undefined".equals(projectId)){ + if(projectId!=null && !"undefined".equals(projectId) && !"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 d7135fdf..7b4d6bd3 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(StringUtils.isNotBlank(deptId) && !"0".equals(deptId) && !"undefined".equals(deptId)){ + if(deptId!=null && !"undefined".equals(deptId) && !"0".equals(deptId)){ surProjectWorkSpecial.setNowDept(deptId); } - if(StringUtils.isNotBlank(projectId) && !"0".equals(projectId) && !"undefined".equals(projectId)){ + if(projectId!=null && !"undefined".equals(projectId) && !"0".equals(projectId)){ surProjectWorkSpecial.setProjectId(Convert.toLong(projectId)); } return getDataTable(surProjectWorkSpecialService.selectBgscreenWorkSpecialList(surProjectWorkSpecial)); @@ -49,7 +49,7 @@ public class ProjectSpecialController extends BaseController { public TableDataInfo getProjectSpecialList(String projectId){ SurProjectWorkSpecial surProjectWorkSpecial = new SurProjectWorkSpecial(); surProjectWorkSpecial.setIsDel(Convert.toInt(PublicStateEnum.OK.getCode())); - if(StringUtils.isNotBlank(projectId) && !"0".equals(projectId) && !"undefined".equals(projectId)){ + if(projectId!=null && !"0".equals(projectId)){ surProjectWorkSpecial.setProjectId(Convert.toLong(projectId)); } return getDataTable(surProjectWorkSpecialService.selectSurProjectWorkSpecialList(surProjectWorkSpecial));