Merge remote-tracking branch 'origin/dev_2307' into dev_2307

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java

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