liuyc před 2 roky
rodič
revize
aba56169c4

+ 2 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ArchiveTreeController.java

@@ -94,10 +94,10 @@ public class ArchiveTreeController extends BladeController {
         List<ArchiveTree> archiveTrees = archiveTreeService.selectByParentIdOrId(id);
         archiveTrees.stream().forEach(archiveTree -> {
             if (archiveTree.getParentId() == Long.parseLong(id)) {
-                throw new ServiceException("当前节点下存在子节点,删除失败");
+                throw new ServiceException("当前节点下存在子节点删除失败");
             }
             if (archiveTree.getIsUploadFileDisplayConfigurationTree() == 1) {
-                throw new ServiceException("当前节点被引用中,删除失败");
+                throw new ServiceException("当前节点被引用中删除失败");
             }
         });
         return R.status(archiveTreeService.deleteLogic(Func.toLongList(id)));

+ 3 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ContractInfoController.java

@@ -161,17 +161,17 @@ public class ContractInfoController extends BladeController {
     public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
         List<WbsTreeContract> wbsTreeContracts = wbsTreeContractService.findWbsTreeContract(ids);
         if (wbsTreeContracts.size() > 0) {
-            return R.fail("合同段存在关联的WBS树,删除失败");
+            return R.fail("合同段存在关联的WBS树删除失败");
         }
         Long list = saveUserInfoByProjectMapper.selectCount(Wrappers.<SaveUserInfoByProjectDTO>query().lambda()
                 .eq(SaveUserInfoByProjectDTO::getContractId, ids)
         );
         if (list > 0L) {
-            return R.fail("当前合同段存在关联用户,删除失败");
+            return R.fail("当前合同段存在关联用户删除失败");
         }
         Integer list2 = saveUserInfoByProjectMapper.selectSGJL(ids);
         if (list2 > 0) {
-            return R.fail("当前监理合同段存在关联的施工合同信息,删除失败");
+            return R.fail("当前监理合同段存在关联的施工合同信息删除失败");
         }
         return R.status(contractInfoService.deleteLogic(Func.toLongList(ids)));
     }

+ 3 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ProjectInfoController.java

@@ -147,15 +147,15 @@ public class ProjectInfoController extends BladeController {
     public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
         List<ContractInfo> infos = iContractInfoService.findContractInProject(ids);
         if (infos.size() > 0) {
-            return R.fail("当前项目有合同段,删除失败");
+            return R.fail("当前项目有合同段删除失败");
         }
         List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateService.findWbsTreePrivate(ids);
         if (wbsTreePrivates.size() > 0) {
-            return R.fail("当前项目存在WBS私有树,删除失败");
+            return R.fail("当前项目存在WBS私有树删除失败");
         }
         List<SaveUserInfoByProjectDTO> list = saveUserInfoByProjectService.selectList(ids);
         if (list.size() > 0) {
-            return R.fail("当前项目被用户关联中,删除失败");
+            return R.fail("当前项目被用户关联中删除失败");
         }
         return R.status(projectInfoService.deleteLogic(Func.toLongList(ids)));
     }

+ 2 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsInfoController.java

@@ -134,7 +134,7 @@ public class WbsInfoController extends BladeController {
     public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
         /*List<WbsTree> list = wbsTreeService.findByWbsTreeNode(ids);
         if (list.size() > 0) {
-            return R.fail("当前模板根节点下有子节点,删除失败");
+            return R.fail("当前模板根节点下有子节点删除失败");
         }*/
         Long wbsTreePrivates = wbsTreePrivateMapper.selectCount(Wrappers.<WbsTreePrivate>query()
                 .lambda()
@@ -142,7 +142,7 @@ public class WbsInfoController extends BladeController {
                 .eq(WbsTreePrivate::getStatus, 1)
                 .eq(WbsTreePrivate::getIsDeleted, 0));
         if (wbsTreePrivates > 0L) {
-            return R.fail("当前模板已被项目引用,删除失败");
+            return R.fail("当前模板已被项目引用删除失败");
         }
         boolean b = wbsInfoService.deleteLogic(Func.toLongList(ids));
         if (b) {