代码合并

src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java

@@ -32,7 +32,6 @@ import weaver.workflow.field.BrowserComInfo;
 
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @Author weaver_cl
@@ -237,16 +236,16 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
             String customValue = extendInfoPO.getCustomValue();
             String fieldStrLength = SelectOptionParam.getTextLength(customValue);
             //自定义字段排序 标识rowKey
-            String fieldidrowKey;
-            int dsporder = extendInfoPO.getShowOrder();
+            String fieldIdRowKey;
+            int showOrder = extendInfoPO.getShowOrder();
             boolean isUsed = false;
             // TODO 去除脏数据后调整为extendInfoPO.getId() > 0
             // 系统字段id<0
             boolean isSysField = extendInfoPO.getExtendGroupId() < 0;
             if (isSysField) {
-                fieldidrowKey = fieldId + "_hrm";
+                fieldIdRowKey = fieldId + "_hrm";
             } else {
-                fieldidrowKey = fieldId + "_cus";
+                fieldIdRowKey = fieldId + "_cus";
             }
             if (!isSysField) {
                 isUsed = ExtendInfoBO.fieldIsUsed(extendInfoPO.getTableName(), extendInfoPO.getFieldName());
@@ -339,8 +338,8 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
             recordInfo.put("required", extendInfoPO.getIsrequired() + "");
             recordInfo.put("isModify", extendInfoPO.getEditShow() + "");
             recordInfo.put("viewAttr", isUsed || isSysField ? 1 : 2);
-            recordInfo.put("key", "" + dsporder);
-            recordInfo.put("fieldidrowKey", fieldidrowKey);
+            recordInfo.put("key", "" + showOrder);
+            recordInfo.put("fieldidrowKey", fieldIdRowKey);
 
             fieldInfo.put("record", recordInfo);
 
@@ -463,8 +462,6 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
         });
 
 
-
-
     }
 
     private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO, Integer max) {
@@ -480,7 +477,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
     }
 
 
-    private ExtendGroupPO buildExtendGroupType(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) {
+    private ExtendGroupPO buildExtendGroupType(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam, Integer max) {
         return ExtendGroupPO.builder()
                 .extendType(moduleTypeEnum.getValue())
                 .groupName(fieldTypeTreeParam.getName())