Merge remote-tracking branch 'origin/master'

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCommissionCheckServiceImpl.java

@@ -143,16 +143,26 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
         queryWrapper.eq(ZhcxCommissionCheckBaseInfoTreeDo::getDeleted,"0")
                 .eq(ZhcxCommissionCheckBaseInfoTreeDo::getBaseinfoid,productTypeId);
         List<ZhcxCommissionCheckBaseInfoTreeDo> list = zhcxCommissionCheckBaseInfoTreeService.list(queryWrapper);
-        if(list.size() > 0){
+        if(!list.isEmpty()){
             List<ZhcxCommissionCheckDetailTreeDo> targetList = new ArrayList<>();
             list.forEach(tree -> {
                 tree.setId(tree.getId()+check.getProjectcode()).setBaseinfoid(check.getProjectcode());
+                if(!tree.getPid().equals("-1")){
+                    tree.setPid(tree.getPid()+check.getProjectcode());
+                }
                 ZhcxCommissionCheckDetailTreeDo target = new ZhcxCommissionCheckDetailTreeDo(); // 初始化一个目标对象
                 BeanUtils.copyProperties(tree, target);
                 targetList.add(target);
             });
+
+            LambdaQueryWrapper<ZhcxCommissionCheckDetailTreeDo> queryWrapper2 = new LambdaQueryWrapper<>();
+            queryWrapper2.eq(ZhcxCommissionCheckDetailTreeDo::getDeleted,"0")
+                    .eq(ZhcxCommissionCheckDetailTreeDo::getBaseinfoid,check.getProjectcode());
+            List<ZhcxCommissionCheckDetailTreeDo> listed = zhcxCommissionCheckDetailTreeService.list(queryWrapper2);
             //zhcxCommissionCheckBaseInfoTreeService.saveBatch(list);
-            zhcxCommissionCheckDetailTreeService.saveBatch(targetList);
+            if(listed.isEmpty()){
+                zhcxCommissionCheckDetailTreeService.saveBatch(targetList);
+            }
         }
         // 试车子表
         List<ZhcxCommissionCheckDetailDo> checkDetails = checkDTO.getCheckDetails();