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