From 8efeace20af087a4bdc921a5fa326d54192e0b9d Mon Sep 17 00:00:00 2001
From: Parker <meet.parker@foxmail.com>
Date: Mon, 21 Dec 2020 16:46:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E5=85=B8=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/opsli/core/utils/DictUtil.java  | 15 ++++++++-------
 .../dict/service/impl/DictDetailServiceImpl.java  |  7 -------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DictUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DictUtil.java
index 89af8e3b..99670442 100644
--- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DictUtil.java
+++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DictUtil.java
@@ -131,7 +131,6 @@ public class DictUtil {
                         dictWrapperModel.setTypeCode(model.getTypeCode());
                         dictWrapperModel.setDictName(model.getDictName());
                         dictWrapperModel.setDictValue(model.getDictValue());
-                        dictWrapperModel.setDictSort(model.getSortNo());
                         dictWrapperModel.setModel(model);
                         // 保存至缓存
                         DictUtil.put(dictWrapperModel);
@@ -219,7 +218,6 @@ public class DictUtil {
                         dictWrapperModel.setTypeCode(model.getTypeCode());
                         dictWrapperModel.setDictName(model.getDictName());
                         dictWrapperModel.setDictValue(model.getDictValue());
-                        dictWrapperModel.setDictSort(model.getSortNo());
                         dictWrapperModel.setModel(model);
                         // 保存至缓存
                         DictUtil.put(dictWrapperModel);
@@ -273,7 +271,6 @@ public class DictUtil {
                 dictWrapperModel.setTypeCode(typeCode);
                 dictWrapperModel.setDictName(model.getDictName());
                 dictWrapperModel.setDictValue(model.getDictValue());
-                dictWrapperModel.setDictSort(model.getSortNo());
                 dictWrapperModels.add(dictWrapperModel);
             }
             if(!dictWrapperModels.isEmpty()){
@@ -320,7 +317,6 @@ public class DictUtil {
                     dictWrapperModel.setTypeCode(typeCode);
                     dictWrapperModel.setDictName(model.getDictName());
                     dictWrapperModel.setDictValue(model.getDictValue());
-                    dictWrapperModel.setDictSort(model.getSortNo());
                     dictWrapperModels.add(dictWrapperModel);
                 }
                 if(!dictWrapperModels.isEmpty()){
@@ -338,7 +334,6 @@ public class DictUtil {
                         dictWrapperModel.setTypeCode(model.getTypeCode());
                         dictWrapperModel.setDictName(model.getDictName());
                         dictWrapperModel.setDictValue(model.getDictValue());
-                        dictWrapperModel.setDictSort(model.getSortNo());
                         dictWrapperModel.setModel(model);
                         dictWrapperModels.add(dictWrapperModel);
                         // 保存至缓存
@@ -378,8 +373,14 @@ public class DictUtil {
      */
     private static List<DictWrapper> sortDictWrappers(List<DictWrapper> dictWrapperModels) {
         ListUtil.sort(dictWrapperModels, (o1, o2) -> {
-            int oInt1 = o1.getDictValue()==null?Integer.MAX_VALUE:o1.getDictSort();
-            int oInt2 = o2.getDictValue()==null?Integer.MAX_VALUE:o2.getDictSort();
+            int oInt1 = Integer.MAX_VALUE;
+            int oInt2 = Integer.MAX_VALUE;
+            if(o1 != null && o1.getModel() != null){
+                oInt1 = o1.getModel().getSortNo()==null?oInt1:o1.getModel().getSortNo();
+            }
+            if(o2 != null && o2.getModel() != null){
+                oInt2 = o2.getModel().getSortNo()==null?oInt2:o2.getModel().getSortNo();
+            }
             return Integer.compare(oInt1, oInt2);
         });
         return dictWrapperModels;
diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java
index 6f8265e6..5bd443d9 100644
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java
@@ -91,7 +91,6 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
                     dictWrapperModel.setTypeCode(dictDetailModel.getTypeCode());
                     dictWrapperModel.setDictName(dictDetailModel.getDictName());
                     dictWrapperModel.setDictValue(dictDetailModel.getDictValue());
-                    dictWrapperModel.setDictSort(model.getSortNo());
                     dictWrapperList.add(dictWrapperModel);
                 }
                 // 删除缓存
@@ -136,7 +135,6 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
                     dictWrapperModel.setTypeCode(dictDetailModel.getTypeCode());
                     dictWrapperModel.setDictName(dictDetailModel.getDictName());
                     dictWrapperModel.setDictValue(dictDetailModel.getDictValue());
-                    dictWrapperModel.setDictSort(model.getSortNo());
                     dictWrapperList.add(dictWrapperModel);
                 }
                 // 删除缓存
@@ -170,7 +168,6 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
                     dictWrapperModel.setTypeCode(dictDetailModel.getTypeCode());
                     dictWrapperModel.setDictName(dictDetailModel.getDictName());
                     dictWrapperModel.setDictValue(dictDetailModel.getDictValue());
-                    dictWrapperModel.setDictSort(dictDetailModel.getSortNo());
                     dictWrapperList.add(dictWrapperModel);
                 }
                 // 删除缓存
@@ -202,7 +199,6 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
                     dictWrapperModel.setTypeCode(dictDetailModel.getTypeCode());
                     dictWrapperModel.setDictName(dictDetailModel.getDictName());
                     dictWrapperModel.setDictValue(dictDetailModel.getDictValue());
-                    dictWrapperModel.setDictSort(dictDetailModel.getSortNo());
                     dictWrapperList.add(dictWrapperModel);
                 }
                 // 删除缓存
@@ -240,7 +236,6 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
                     dictWrapperModel.setTypeCode(sysDictDetail.getTypeCode());
                     dictWrapperModel.setDictName(sysDictDetail.getDictName());
                     dictWrapperModel.setDictValue(sysDictDetail.getDictValue());
-                    dictWrapperModel.setDictSort(sysDictDetail.getSortNo());
 
                     dictWrapperModels.add(dictWrapperModel);
 
@@ -293,7 +288,6 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
                     dictWrapperModel.setTypeCode(sysDictDetail.getTypeCode());
                     dictWrapperModel.setDictName(sysDictDetail.getDictName());
                     dictWrapperModel.setDictValue(sysDictDetail.getDictValue());
-                    dictWrapperModel.setDictSort(sysDictDetail.getSortNo());
 
                     dictWrapperModels.add(dictWrapperModel);
 
@@ -342,7 +336,6 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
                     dictWrapperModel.setTypeCode(dictDetailModel.getTypeCode());
                     dictWrapperModel.setDictName(dictDetailModel.getDictName());
                     dictWrapperModel.setDictValue(dictDetailModel.getDictValue());
-                    dictWrapperModel.setDictSort(dictDetailModel.getSortNo());
                     dictWrapperList.add(dictWrapperModel);
                 }
                 // 删除缓存