BUG

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -1716,7 +1716,9 @@ public class InformationWriteQueryController extends BladeController {
             }
 
             if (resultFileData.size() > 0) {
-                //入库
+                //先删除，在入库
+                List<String> tabIds = resultFileData.stream().map(TableFile::getTabId).distinct().collect(Collectors.toList());
+                jdbcTemplate.execute("delete from m_table_file WHERE tab_id in(" + StringUtils.join(tabIds, ",") + ")");
                 if (tableFileClient.saveBatch(resultFileData) && updatePKeyIds.size() > 0) {
                     //修改表的文件按钮状态
                     wbsTreeContractClient.updateTabFileTypeByPkeyIds(new ArrayList<>(updatePKeyIds));

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -1659,9 +1659,7 @@ public class ExcelTabController extends BladeController {
         for (int i = 1; i < dataArray.size(); i++) {
             JSONObject jsonObject = dataArray.getJSONObject(i);
             pkeyIds += "," + jsonObject.getString("pkeyId");
-            ;
             groupIds += "," + jsonObject.getString("tabGroupId");
-            ;
         }
         /*全加载，或者可以优化成依赖加载*/
         List<TableInfo> tableInfoList = this.excelTabService.getTableInfoList(dataArray);

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeController.java

@@ -218,8 +218,12 @@ public class WbsTreeController extends BladeController {
                             .select(WbsTreePrivate::getPKeyId).eq(WbsTreePrivate::getStatus, 1).eq(WbsTreePrivate::getType, 2).eq(WbsTreePrivate::getId, id)).stream().map(WbsTreePrivate::getPKeyId).collect(Collectors.toList());
                     List<Long> contractPKeyIds = wbsTreeContractMapper.selectList(Wrappers.<WbsTreeContract>query().lambda()
                             .select(WbsTreeContract::getPKeyId).eq(WbsTreeContract::getStatus, 1).eq(WbsTreeContract::getType, 2).and(obj -> obj.eq(WbsTreeContract::getId, id).or().eq(WbsTreeContract::getOldId, id))).stream().map(WbsTreeContract::getPKeyId).collect(Collectors.toList());
-                    jdbcTemplate.execute("update m_wbs_tree_private set is_deleted = 1 where p_key_id in(" + StringUtils.join(projectPKeyIds, ",") + ")");
-                    jdbcTemplate.execute("update m_wbs_tree_contract set is_deleted = 1 where p_key_id in(" + StringUtils.join(contractPKeyIds, ",") + ")");
+                    if (projectPKeyIds.size()>0){
+                        jdbcTemplate.execute("update m_wbs_tree_private set is_deleted = 1 where p_key_id in(" + StringUtils.join(projectPKeyIds, ",") + ")");
+                    }
+                    if (contractPKeyIds.size()>0){
+                        jdbcTemplate.execute("update m_wbs_tree_contract set is_deleted = 1 where p_key_id in(" + StringUtils.join(contractPKeyIds, ",") + ")");
+                    }
 
                     return R.success("删除成功");
                 }

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/TableFileClientImpl.java

@@ -39,6 +39,7 @@ public class TableFileClientImpl implements TableFileClient {
     public List<TableFile> getTabFilesByTabIds(String tabFileIds) {
         return tableFileService.getBaseMapper().selectList(Wrappers.<TableFile>lambdaQuery()
                 .in(TableFile::getTabId, Func.toLongList(tabFileIds))
+                .ne(TableFile::getType,1) //排除源文件
                 .isNotNull(TableFile::getTabId)
         );
     }