Quellcode durchsuchen

字典表基础信息修改

rengb vor 3 Jahren
Ursprung
Commit
3f8c53a460

+ 2 - 2
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DictionaryInfo.java

@@ -32,7 +32,7 @@ public class DictionaryInfo implements Serializable {
      * 分组(值自定义)
      */
     @TableField("group_type")
-    private Long groupType;
+    private String groupType;
 
     /**
      * 内容
@@ -56,7 +56,7 @@ public class DictionaryInfo implements Serializable {
      * 返回类型(0: 都返回,1:后台维护返回 2:界面返回)
      */
     @TableField("return_type")
-    private Integer returnType;
+    private String returnType;
 
     /**
      * 排序

+ 1 - 1
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/User.java

@@ -80,7 +80,7 @@ public class User implements Serializable {
      * 工号
      */
     @TableField("job_no")
-    private Long jobNo;
+    private Integer jobNo;
 
     /**
      * 排序

+ 2 - 2
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/DictionaryInfoFacade.java

@@ -24,12 +24,12 @@ public class DictionaryInfoFacade extends DictionaryInfoServiceImpl {
     @Autowired
     private RedisService redisService;
 
-    public Map<Integer, Map<Long, Map<String, String>>> initDicMap() {
+    public Map<String, Map<String, Map<String, String>>> initDicMap() {
         QueryWrapper<DictionaryInfo> dictionaryInfoQueryWrapper = new QueryWrapper<DictionaryInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("status", StatusEnum.Enable.getKey())
                 .orderByDesc("order_no");
-        Map<Integer, Map<Long, Map<String, String>>> dicMap = list(dictionaryInfoQueryWrapper)
+        Map<String, Map<String, Map<String, String>>> dicMap = list(dictionaryInfoQueryWrapper)
                 .stream()
                 .collect(
                         Collectors.groupingBy(

+ 2 - 2
security-center/src/main/java/com/lantone/security/component/DictionaryHolder.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.PostConstruct;
 
 /**
- * @Description: 字典信息操作组件
+ * @Description: 系统字典信息操作组件
  * @author: rengb
  * @time: 2021/1/5 18:27
  */
@@ -18,7 +18,7 @@ public class DictionaryHolder {
     private DictionaryInfoFacade dictionaryInfoFacade;
 
     /**
-     * 预加载所有字典信息
+     * 预加载所有系统字典信息
      */
     @PostConstruct
     public void initDicMap() {