|
|
@ -342,7 +342,6 @@ public class RulexController extends JeecgController<Rulex, IRulexService> { |
|
|
|
RuleVo ruleVo = ruleVoList.get(i); |
|
|
|
RuleVo ruleVo = ruleVoList.get(i); |
|
|
|
//对应字段
|
|
|
|
//对应字段
|
|
|
|
String fieldId = ruleVo.getFieldId(); |
|
|
|
String fieldId = ruleVo.getFieldId(); |
|
|
|
if(fieldId!=null){ |
|
|
|
|
|
|
|
LambdaQueryWrapper<Fieldx> rulexLambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
LambdaQueryWrapper<Fieldx> rulexLambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
rulexLambdaQueryWrapper.eq(Fieldx::getFieldName, fieldId); |
|
|
|
rulexLambdaQueryWrapper.eq(Fieldx::getFieldName, fieldId); |
|
|
|
Fieldx byId = iFieldxService.getOne(rulexLambdaQueryWrapper); |
|
|
|
Fieldx byId = iFieldxService.getOne(rulexLambdaQueryWrapper); |
|
|
@ -355,8 +354,6 @@ public class RulexController extends JeecgController<Rulex, IRulexService> { |
|
|
|
return Result.error("第"+(i + 1) +"条数据,对应字段输入错误,请核对"); |
|
|
|
return Result.error("第"+(i + 1) +"条数据,对应字段输入错误,请核对"); |
|
|
|
} |
|
|
|
} |
|
|
|
rulex.setFieldId(byId.getId()); |
|
|
|
rulex.setFieldId(byId.getId()); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//对应功能
|
|
|
|
//对应功能
|
|
|
|
String functionName = ruleVo.getFunctionId(); |
|
|
|
String functionName = ruleVo.getFunctionId(); |
|
|
|
LambdaQueryWrapper<Functionx> functionxLambdaQueryWrapper = new LambdaQueryWrapper<Functionx>(); |
|
|
|
LambdaQueryWrapper<Functionx> functionxLambdaQueryWrapper = new LambdaQueryWrapper<Functionx>(); |
|
|
|