Merge branch 'master' of http://121.41.40.202:3000/zhuwei/bladex

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -1141,7 +1141,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     informationQueryService.delAsyncWbsTree(queryinfo.getContractId().toString());
                 }
 
-                //修改试验业务状态
+                //修改试验业务状态（已审批的情况下修改）
                 if (new Integer(2).equals(queryinfo.getType()) && ObjectUtil.isNotEmpty(queryinfo.getWbsId()) && status != 3) {
                     jdbcTemplate.execute("update u_trial_self_inspection_record set task_status = '已审批' where id = " + queryinfo.getWbsId());
                 }

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

@@ -525,23 +525,25 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         Map<Long, WbsTreePrivate> maps = wbsTreePrivatesAllNow.stream().filter(f -> Objects.nonNull(f.getId())).collect(Collectors.toMap(WbsTreePrivate::getId, wbsTreePrivate -> wbsTreePrivate, (obj1, obj2) -> obj1));
 
         for (WbsTreePrivate wbsTreePrivate : wbsTreePrivates) {
-            WbsTreePrivate treePrivateNow = maps.get(wbsTreePrivate.getId());
-            //判断相同节点基础信息、元素表类型、元素表所属方是否发生改变
-            if (treePrivateNow != null && this.fieldsNotEqualPrivateWbs(wbsTreePrivate, treePrivateNow)) {
-                //修改项目wbs信息
-                WbsTreePrivate wbsPrivate = BeanUtil.copyProperties(wbsTreePrivate, WbsTreePrivate.class);
-                if (wbsPrivate != null) {
-                    wbsPrivate.setWbsId(wbsId);
-                    wbsPrivate.setProjectId(projectId);
-                    listPrivate.add(wbsPrivate);
-                }
-                for (Long id : contractInfosIds) {
-                    //修改合同段wbs信息
-                    WbsTreeContract wbsContract = BeanUtil.copyProperties(wbsTreePrivate, WbsTreeContract.class);
-                    if (wbsContract != null) {
-                        wbsContract.setContractId(id.toString());
-                        wbsContract.setProjectId(projectId);
-                        listContract.add(wbsContract);
+            if (ObjectUtil.isNotEmpty(wbsTreePrivate)) {
+                WbsTreePrivate treePrivateNow = maps.getOrDefault(wbsTreePrivate.getId(), null);
+                //判断相同节点基础信息、元素表类型、元素表所属方是否发生改变
+                if (treePrivateNow != null && this.fieldsNotEqualPrivateWbs(wbsTreePrivate, treePrivateNow)) {
+                    //修改项目wbs信息
+                    WbsTreePrivate wbsPrivate = BeanUtil.copyProperties(wbsTreePrivate, WbsTreePrivate.class);
+                    if (wbsPrivate != null) {
+                        wbsPrivate.setWbsId(wbsId);
+                        wbsPrivate.setProjectId(projectId);
+                        listPrivate.add(wbsPrivate);
+                    }
+                    for (Long id : contractInfosIds) {
+                        //修改合同段wbs信息
+                        WbsTreeContract wbsContract = BeanUtil.copyProperties(wbsTreePrivate, WbsTreeContract.class);
+                        if (wbsContract != null) {
+                            wbsContract.setContractId(id.toString());
+                            wbsContract.setProjectId(projectId);
+                            listContract.add(wbsContract);
+                        }
                     }
                 }
             }