bug修复

dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/FuncidDefChangeRecordService.java

@@ -686,7 +686,8 @@ public class FuncidDefChangeRecordService {
         ArrayNode operationContentAfter = JsonNodeFactory.instance.arrayNode();
         Set<?> keySets = Collections.unmodifiableSet(beforeParamMap.keySet());
         for (Map.Entry<?, ?> afterEntry : afterParamMap.entrySet()) {
-            if(!keySets.contains(afterEntry.getKey()) || "id".equals(afterEntry.getKey()) || "version".equals(afterEntry.getKey())){
+            String key = afterEntry.getKey().toString();
+            if(!keySets.contains(key) || "id".equals(key) || "version".equals(key)|| "orderSeq".equals(key) || "shareType".equals(key)){
                 continue;
             }
             Object afterValue = afterEntry.getValue();
@@ -694,6 +695,10 @@ public class FuncidDefChangeRecordService {
             if(ObjectUtils.equals(afterValue,beforeValue)){
                 continue;
             }
+            if(StringUtils.isBlank(ObjectUtils.toString(afterValue, null)) && StringUtils.isBlank(ObjectUtils.toString(beforeValue, null))){
+               continue;
+            }
+
             ObjectNode object = JsonNodeFactory.instance.objectNode();
             //变更前
             if(beforeValue ==null){
@@ -726,7 +731,7 @@ public class FuncidDefChangeRecordService {
             String key = afterEntry.getKey().toString();
             Object value = afterEntry.getValue();
             if("groupCode".equals(key) || "projectId".equals(key) || "type".equals(key)|| "operationType".equals(key)
-                 || "classCode".equals(key) || "objType".equals(key) || "parentCode".equals(key)){
+                 || "classCode".equals(key) || "objType".equals(key) || "parentCode".equals(key)|| "orderSeq".equals(key) || "shareType".equals(key)){
                 continue;
             }
             if(value == null){

dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/FuncidDefService.java

@@ -75,7 +75,11 @@ public class FuncidDefService {
         // 三级按照excel表格的逻辑进行排序展示
         list.sort((k1,k2)->{
             if (StrUtil.isBlank(k1.getFirstTag()) && StrUtil.isBlank(k2.getFirstTag())){
-                return 0;
+                int compareTo = StrUtil.blankToDefault(k1.getShareType(),"").compareTo(StrUtil.blankToDefault(k2.getShareType(),""));
+                if (0==compareTo) {
+                    return k1.getOrderSeq().compareTo(k2.getOrderSeq());
+                }
+                return compareTo;
             }
             if (StrUtil.isBlank(k2.getFirstTag())){
                 k2.setFirstTag("");