bug

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -519,8 +519,6 @@
                 full_name = #{item.nodeName},
                 node_type = #{item.nodeType},
                 major_data_type = #{item.majorDataType},
-                /*unique_code = #{item.uniqueCode},
-                partition_code = #{item.partitionCode},*/
                 table_type = #{item.tableType},
                 table_owner = #{item.tableOwner}
             </set>

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.xml

@@ -260,8 +260,6 @@
                 full_name = #{item.fullName},
                 node_type = #{item.nodeType},
                 major_data_type = #{item.majorDataType},
-                /*unique_code = #{item.uniqueCode},
-                partition_code = #{item.partitionCode},*/
                 table_type = #{item.tableType},
                 table_owner = #{item.tableOwner},
                 fill_rate = #{item.fillRate},

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

@@ -327,31 +327,29 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                                 || (ObjectUtils.isNotEmpty(wbsTree.getImportMatchingInfo()) && !wbsTree.getImportMatchingInfo().equals(wbsTreePrivate.getImportMatchingInfo()))
                         )) {
                     //修改项目wbs信息
-                    WbsTreePrivate wbsPrivate = new WbsTreePrivate();
-                    BeanUtil.copyProperties(wbsTree, wbsPrivate);
-                    wbsPrivate.setProjectId(projectId);
-                    listPrivate.add(wbsPrivate);
-
+                    WbsTreePrivate wbsPrivate = BeanUtil.copyProperties(wbsTree, WbsTreePrivate.class);
+                    if (wbsPrivate != null) {
+                        wbsPrivate.setProjectId(projectId);
+                        listPrivate.add(wbsPrivate);
+                    }
                     for (ContractInfo contractInfo : contractInfos) {
                         //修改合同段wbs信息
-                        WbsTreeContract wbsContract = new WbsTreeContract();
-                        BeanUtil.copyProperties(wbsTree, wbsContract);
-                        wbsContract.setContractId(String.valueOf(contractInfo.getId()));
-                        wbsContract.setProjectId(projectId);
-                        listContract.add(wbsContract);
+                        WbsTreeContract wbsContract = BeanUtil.copyProperties(wbsTree, WbsTreeContract.class);
+                        if (wbsContract != null) {
+                            wbsContract.setContractId(String.valueOf(contractInfo.getId()));
+                            wbsContract.setProjectId(projectId);
+                            listContract.add(wbsContract);
+                        }
                     }
                 }
             }
         }
-        try {
-            if (listPrivate.size() > 0) {
-                baseMapper.updateBatchWbsPrivate(listPrivate);
-            }
-            if (listContract.size() > 0) {
-                wbsTreeContractMapper.updateBatchWbsContract(listContract);
-            }
-        } catch (Exception e) {
-            throw new ServiceException("节点基础信息同步修改失败 " + e.getMessage());
+
+        if (listPrivate.size() > 0) {
+            baseMapper.updateBatchWbsPrivate(listPrivate);
+        }
+        if (listContract.size() > 0) {
+            wbsTreeContractMapper.updateBatchWbsContract(listContract);
         }
         return true;
     }
@@ -375,32 +373,30 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                                 || (ObjectUtils.isNotEmpty(wbsTreePrivate.getImportMatchingInfo()) && !wbsTreePrivate.getImportMatchingInfo().equals(treePrivateNow.getImportMatchingInfo()))
                         )) {
                     //修改项目wbs信息
-                    WbsTreePrivate wbsPrivate = new WbsTreePrivate();
-                    BeanUtil.copyProperties(wbsTreePrivate, wbsPrivate);
-                    wbsPrivate.setWbsId(wbsId);
-                    wbsPrivate.setProjectId(projectId);
-                    listPrivate.add(wbsPrivate);
-
+                    WbsTreePrivate wbsPrivate = BeanUtil.copyProperties(wbsTreePrivate, WbsTreePrivate.class);
+                    if (wbsPrivate != null) {
+                        wbsPrivate.setWbsId(wbsId);
+                        wbsPrivate.setProjectId(projectId);
+                        listPrivate.add(wbsPrivate);
+                    }
                     for (ContractInfo contractInfo : contractInfos) {
                         //修改合同段wbs信息
-                        WbsTreeContract wbsContract = new WbsTreeContract();
-                        BeanUtil.copyProperties(wbsTreePrivate, wbsContract);
-                        wbsContract.setContractId(String.valueOf(contractInfo.getId()));
-                        wbsContract.setProjectId(projectId);
-                        listContract.add(wbsContract);
+                        WbsTreeContract wbsContract = BeanUtil.copyProperties(wbsTreePrivate, WbsTreeContract.class);
+                        if (wbsContract != null) {
+                            wbsContract.setContractId(String.valueOf(contractInfo.getId()));
+                            wbsContract.setProjectId(projectId);
+                            listContract.add(wbsContract);
+                        }
                     }
                 }
             }
         }
-        try {
-            if (listPrivate.size() > 0) {
-                baseMapper.updateBatchWbsPrivate(listPrivate);
-            }
-            if (listContract.size() > 0) {
-                wbsTreeContractMapper.updateBatchWbsContract(listContract);
-            }
-        } catch (Exception e) {
-            throw new ServiceException("节点基础信息同步修改失败 " + e.getMessage());
+
+        if (listPrivate.size() > 0) {
+            baseMapper.updateBatchWbsPrivate(listPrivate);
+        }
+        if (listContract.size() > 0) {
+            wbsTreeContractMapper.updateBatchWbsContract(listContract);
         }
         return true;
     }

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

@@ -376,7 +376,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     }
 
     @Override
-    public List<Map<String,Object>> findProjectAndContractList(Long userId) {
+    public List<Map<String, Object>> findProjectAndContractList(Long userId) {
         List<SaveUserInfoByProjectVO2> list = baseMapper.selectListByUserId(userId);
         Map<String, List<SaveUserInfoByProjectVO2>> collect = list.stream().collect(Collectors.groupingBy(SaveUserInfoByProjectVO2::getProjectName));
         return collect.entrySet().stream().map(entity -> {
@@ -434,13 +434,13 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             List<String> idList2 = new ArrayList<>();
 
             if (pawDTO.getReferenceType().equals("public")) {
-                List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda().eq(WbsTreePrivate::getWbsId, pawDTO.getWbsId()).eq(WbsTreePrivate::getProjectId, pawDTO.getProjectId()).eq(WbsTreePrivate::getType, 1));
                 //当前公有引用ids
+                List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda().eq(WbsTreePrivate::getWbsId, pawDTO.getWbsId()).eq(WbsTreePrivate::getProjectId, pawDTO.getProjectId()).eq(WbsTreePrivate::getType, 1));
                 List<String> collect = wbsTreePrivates.stream().map(WbsTreePrivate::getId).collect(Collectors.toList()).stream().map(String::valueOf).collect(Collectors.toList());
                 idList2.addAll(collect);
             } else if (pawDTO.getReferenceType().equals("private")) {
-                List<WbsTreePrivate> wbsTreePrivates2 = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda().eq(WbsTreePrivate::getWbsId, pawDTO.getPrimaryKeyId()).eq(WbsTreePrivate::getProjectId, pawDTO.getProjectId()).eq(WbsTreePrivate::getType, 1));
                 //当前私有引用ids
+                List<WbsTreePrivate> wbsTreePrivates2 = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda().eq(WbsTreePrivate::getWbsId, pawDTO.getPrimaryKeyId()).eq(WbsTreePrivate::getProjectId, pawDTO.getProjectId()).eq(WbsTreePrivate::getType, 1));
                 List<String> collect = wbsTreePrivates2.stream().map(WbsTreePrivate::getId).collect(Collectors.toList()).stream().map(String::valueOf).collect(Collectors.toList());
                 idList2.addAll(collect);
             }
@@ -451,16 +451,11 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             //1.同步修改节点基础信息、私有电签默认信息
             if (saveIds.size() == 0 && delIds.size() == 0) {
                 if (pawDTO.getReferenceType().equals("public")) {
-                    List<WbsTree> allNodeList = findAllNodeList(wbsTreeIds);
                     //获取公有wbs树所有的节点、元素表
-                    List<WbsTree> wbsTreeListAll = new ArrayList<>();
-                    if (allNodeList != null) {
-                        List<WbsTree> wbsTreeList = wbsTreeMapper.selectList(Wrappers.<WbsTree>query().lambda().eq(WbsTree::getWbsId, pawDTO.getWbsId()).eq(WbsTree::getStatus, 1));
-                        wbsTreeListAll.addAll(wbsTreeList);
-                    }
+                    List<WbsTree> wbsTreeListAll = wbsTreeMapper.selectList(Wrappers.<WbsTree>query().lambda().eq(WbsTree::getWbsId, Long.parseLong(pawDTO.getWbsId())).eq(WbsTree::getStatus, 1));
 
                     //获取项目私有wbs树下所有的节点、元素表
-                    List<WbsTreePrivate> wbsTreePrivatesAll = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda().eq(WbsTreePrivate::getWbsId, pawDTO.getWbsId()).eq(WbsTreePrivate::getProjectId, pawDTO.getProjectId()).eq(WbsTreePrivate::getStatus, 1));
+                    List<WbsTreePrivate> wbsTreePrivatesAll = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda().eq(WbsTreePrivate::getWbsId, Long.parseLong(pawDTO.getWbsId())).eq(WbsTreePrivate::getProjectId, pawDTO.getProjectId()).eq(WbsTreePrivate::getStatus, 1));
 
                     //修改公有wbs节点信息、元素表基础信息到项目级wbs、合同段wbs
                     this.updateWbsInfoPrivateAsync(wbsTreeListAll, wbsTreePrivatesAll, pawDTO.getProjectId());

pom.xml

@@ -186,6 +186,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven.plugin.version}</version>
@@ -196,8 +197,13 @@
                     <compilerArgs>
                         <arg>-parameters</arg>
                     </compilerArgs>
+                    <compilerArguments>
+                        <verbose/>
+                        <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>
+                    </compilerArguments>
                 </configuration>
             </plugin>
+
         </plugins>
     </build>