diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java index 6c33279..88af61d 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java @@ -303,25 +303,25 @@ public class RulexController extends JeecgController { //必要字段判断空值 for (int i = 0; i < list.size(); i++) { if ( - list.get(i).getRuleNo() == null || - list.get(i).getRuleCode() == null || -// list.get(i).getPmDescribe() == null && - list.get(i).getModuleId() == null || - list.get(i).getFunctionId() == null || -// list.get(i).getDiagrams() == null && - list.get(i).getTableId() == null || -// list.get(i).getFieldId() == null || - list.get(i).getManagerUsers() == null || - list.get(i).getWorkLevel() == null || - list.get(i).getWorkStatus() == null || -// list.get(i).getStartTime() == null && -// list.get(i).getManagerUsers() == null && -// list.get(i).getDuration() == null && -// list.get(i).getSubmitTime() == null && - list.get(i).getRealDuration() == null && - list.get(i).getStatus() == null || - list.get(i).getVerisonStatus() == null || - list.get(i).getVerison() == null) { + StringUtils.isBlank(list.get(i).getRuleNo()) || + StringUtils.isBlank(list.get(i).getRuleCode()) || +// StringUtils.isBlank() list.get(i).getPmDescribe() == null && + StringUtils.isBlank(list.get(i).getModuleId() ) || + StringUtils.isBlank(list.get(i).getFunctionId()) || +// StringUtils.isBlank() list.get(i).getDiagrams() == null && + StringUtils.isBlank( list.get(i).getTableId() ) || +// StringUtils.isBlank() list.get(i).getFieldId() == null || + StringUtils.isBlank( list.get(i).getManagerUsers())|| + StringUtils.isBlank(list.get(i).getWorkLevel()) || + StringUtils.isBlank(list.get(i).getWorkStatus()) || +// StringUtils.isBlank() list.get(i).getStartTime() == null && +// StringUtils.isBlank() list.get(i).getManagerUsers() == null && +// StringUtils.isBlank() list.get(i).getDuration() == null && +// StringUtils.isBlank() list.get(i).getSubmitTime() == null && + StringUtils.isBlank(list.get(i).getRealDuration()) && + StringUtils.isBlank(list.get(i).getStatus() ) || + StringUtils.isBlank( list.get(i).getVerisonStatus()) || + StringUtils.isBlank(list.get(i).getVerison()) ) { message.put("isError", "true"); message.put("closeable","true"); @@ -361,7 +361,7 @@ public class RulexController extends JeecgController { //对应模块 //判断上级模块是否存在 int n = 0; - if (pModuleId != null) { + if (!StringUtils.isBlank(pModuleId) ) { //存在 String pid = ""; for (Modulex modulex : modulexList) { @@ -448,7 +448,7 @@ public class RulexController extends JeecgController { //对应字段 String fieldId = ruleVo.getFieldId(); String tableId1 = rulex.getTableId(); - if (fieldId != null) { + if (!StringUtils.isBlank(fieldId) ) { LambdaQueryWrapper rulexLambdaQueryWrapper = new LambdaQueryWrapper<>(); rulexLambdaQueryWrapper.eq(Fieldx::getFieldName, fieldId).eq(Fieldx::getTableId, tableId1); Fieldx fieldx = iFieldxService.getOne(rulexLambdaQueryWrapper);