Эх сурвалжийг харах

refactor:共通实体null异常

韩帛霖 1 жил өмнө
parent
commit
e0d2abf7d6

+ 0 - 41
ruoyi-common/src/main/java/com/ruoyi/common/constant/ButtonTypeConstants.java

@@ -1,41 +0,0 @@
-package com.ruoyi.common.constant;
-
-/**
- * 按钮类型
- */
-public class ButtonTypeConstants {
-
-    /** 操作按钮 */
-    public static final Long HANDLE = 0L;
-
-    /** 其他按钮 */
-    public static final Long OTHER = 1L;
-
-    /** 表单按钮 */
-    public static final Long FORM = 2L;
-
-    /** 内链按钮 */
-    public static final Long INNER_CHAIN = 3L;
-
-    /** 流程按钮 */
-    public static final Long PROCESS = 4L;
-
-    /** 脚本按钮 */
-    public static final Long SCRIPT = 5L;
-
-    /** 目录 */
-    public static final Long CATALOGUE = 6L;
-
-    /** 外链按钮 */
-    public static final Long OUTSIDE_CHAIN = 7L;
-
-    /** 修改按钮 */
-    public static final Long UPDATE = 8L;
-
-    /** 删除按钮 */
-    public static final Long DELETE = 9L;
-
-    /** 新增按钮 */
-    public static final Long INSERT = 10L;
-
-}

+ 10 - 1
ruoyi-system/src/main/java/com/ruoyi/system/entity/CommonEntity.java

@@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -107,9 +109,16 @@ public class CommonEntity extends BaseEntity implements Serializable {
     }
 
     public CommonEntity() {
+        this.basicMap = new HashMap<>();
+        this.queryMap = new HashMap<>();
+        this.conditionMap = new HashMap<>();
+        this.resultMap = new HashMap<>();
+        this.commMap = new HashMap<>();
+        this.addListMap = new ArrayList<>();
+        this.execlMap = "";
+        this.btnParametersMap = new HashMap<>();
     }
 
-
     public Map<String, Object> getBasicMap() {
         return basicMap;
     }