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

@@ -307,6 +307,29 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
         }
         //必要字段判断空值
         for (int i = 0; i < list.size(); i++) {
+            if (
+                    StringUtils.isBlank(list.get(i).getRuleNo())&&
+                            StringUtils.isBlank(list.get(i).getProjectId()) &&
+                            StringUtils.isBlank(list.get(i).getRuleCode()) &&
+							StringUtils.isBlank(list.get(i).getPmDescribe() ) &&
+                            StringUtils.isBlank(list.get(i).getModuleId()) &&
+                            StringUtils.isBlank(list.get(i).getFunctionId()) &&
+                            StringUtils.isBlank(list.get(i).getTableId())&&
+                               StringUtils.isBlank(list.get(i).getFieldId()) &&
+                            StringUtils.isBlank(list.get(i).getManagerUsers()) &&
+                            StringUtils.isBlank(list.get(i).getWorkLevel())&&
+                            StringUtils.isBlank(list.get(i).getWorkStatus()) &&
+							StringUtils.isBlank(list.get(i).getStartTime()) &&
+							StringUtils.isBlank(list.get(i).getManagerUsers() ) &&
+							StringUtils.isBlank(list.get(i).getDuration()) &&
+							StringUtils.isBlank(list.get(i).getSubmitTime()) &&
+                            StringUtils.isBlank(list.get(i).getRealDuration()) &&
+                            StringUtils.isBlank(list.get(i).getStatus()) ||
+                            StringUtils.isBlank(list.get(i).getVerisonStatus()) &&
+                            StringUtils.isBlank(list.get(i).getVerison())) {
+                continue;
+            }
+
             if (
                     StringUtils.isBlank(list.get(i).getRuleNo()) ||
                     StringUtils.isBlank(list.get(i).getProjectId()) ||

jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -137,9 +137,9 @@ spring:
           #          driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
-          url: jdbc:mysql://182.92.169.222:3306/project_management?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://localhost:3306/project_management?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: ycwl2022.
+          password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis: