Merge branch 'lihb' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsSynchronousServiceImpl.java

@@ -311,8 +311,8 @@ public class WbsSynchronousServiceImpl {
                 List<WbsTreePrivate> editPrivateNodes = new ArrayList<>();
                 for (WbsTreePrivate templateNode : templateNodes) {
                     //数据修复-----------------------------------------------------------------------------------------------------------------------------------开始
-                    if (!isPublic && templateNode.getType() == 2 && collect.contains(2) ) {
-                        if(CollectionUtil.isNotEmpty(formList) && !formList.contains(templateNode.getPKeyId())){
+                    if (!isPublic && templateNode.getType() == 2 && collect.contains(2)) {
+                        if (CollectionUtil.isNotEmpty(formList) && !formList.contains(templateNode.getPKeyId())) {
                             continue;
                         }
                         boolean isUpdate = false;
@@ -514,7 +514,8 @@ public class WbsSynchronousServiceImpl {
             nodeNumEnd++;
             List<WbsTreePrivate> list = collect1.get(pId);
             //排序调整
-            if(wbsTreeSynchronousRecord.getType().contains("7")) {
+            if (wbsTreeSynchronousRecord.getType().contains("7")) {
+                list.sort(Comparator.comparingInt(WbsTreePrivate::getSort));
                 for (WbsTreePrivate wbsTreePrivate : list) {
                     wbsTreePrivateMapper.updateSortByPId(pId, wbsTreePrivate.getSort());
                 }
@@ -798,7 +799,8 @@ public class WbsSynchronousServiceImpl {
             nodeNumEnd++;
             List<WbsTreeContract> list = collect1.get(pId);
             //排序调整
-            if(wbsTreeSynchronousRecord.getType().contains("7")) {
+            if (wbsTreeSynchronousRecord.getType().contains("7")) {
+                list.sort(Comparator.comparingInt(WbsTreeContract::getSort));
                 for (WbsTreeContract wbsTreeContract : list) {
                     wbsTreePrivateMapper.updateSortByPId(pId, wbsTreeContract.getSort());
                 }
@@ -933,11 +935,12 @@ public class WbsSynchronousServiceImpl {
                 for (Long datum : data) {
                     List<WbsTreePrivate> list = collect.get(datum);
                     //修改排序
-                    if(wbsTreeSynchronousRecord.getType().contains("7")){
+                    if (wbsTreeSynchronousRecord.getType().contains("7")) {
+                        list.sort(Comparator.comparingInt(WbsTreePrivate::getSort));
                         for (WbsTreePrivate wbsTreePrivate : list) {
                             Integer sort = wbsTreePrivate.getSort();
-                            if(sort != null){
-                                wbsTreePrivateMapper.updateSortByPId(datum,wbsTreePrivate.getSort());
+                            if (sort != null) {
+                                wbsTreePrivateMapper.updateSortByPId(datum, wbsTreePrivate.getSort());
                             }
                         }
                     }
@@ -1047,11 +1050,12 @@ public class WbsSynchronousServiceImpl {
             for (Long datum : data) {
                 List<WbsTreeContract> list = collect.get(datum);
                 //修改排序
-                if(wbsTreeSynchronousRecord.getType().contains("7")){
+                if (wbsTreeSynchronousRecord.getType().contains("7")) {
+                    list.sort(Comparator.comparingInt(WbsTreeContract::getSort));
                     for (WbsTreeContract wbsTreeContract : list) {
                         Integer sort = wbsTreeContract.getSort();
-                        if(sort != null){
-                            wbsTreeContractMapper.updateSortByPId(datum,wbsTreeContract.getSort());
+                        if (sort != null) {
+                            wbsTreeContractMapper.updateSortByPId(datum, wbsTreeContract.getSort());
                         }
                     }
                 }