瀏覽代碼

修复bug相关

liuyc 3 年之前
父節點
當前提交
234e18ea2a

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

@@ -24,6 +24,7 @@ import org.springblade.manager.entity.ProjectInfo;
 import org.springblade.manager.wrapper.ProjectInfoWrapper;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.rmi.ServerException;
 import java.util.List;
 import java.util.Map;
 
@@ -210,12 +211,16 @@ public class ProjectInfoController extends BladeController {
     @PostMapping("/submitWbsTreeInProject")
     @ApiOperationSupport(order = 12)
     @ApiOperation(value = "保存或修改分配项目级wbs树", notes = "传入WbsTreeContractDTO")
-    public R submitWbsTreeInProject(@RequestBody WbsTreeContractDTO pawDTO) {
-        boolean b = wbsTreeService.submitWbsTreeInProject1(pawDTO);
-        if (b) {
-            return R.success("关联项目级树失败");
+    public R submitWbsTreeInProject(@RequestBody WbsTreeContractDTO pawDTO) throws Exception {
+        if (pawDTO.getWbsType() == 1) {
+            boolean b = wbsTreeService.submitWbsTreeInProject1(pawDTO);
+            if (b) {
+                return R.success("关联项目级树失败");
+            }
+            return R.fail("关联项目级树失败");
+        } else {
+            throw new Exception("试验功能暂未开放");
         }
-        return R.fail("关联项目级树失败");
     }
 
     /**

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

@@ -661,6 +661,9 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean submitWbsTreeInProject1(WbsTreeContractDTO pawDTO) {
+        if (StringUtils.isEmpty(pawDTO.getWbsId())) {
+            throw new ServiceException("请正确选择一个wbs模板");
+        }
         String wbsTreeIds = pawDTO.getWbsTreeIds();
         String[] ids = wbsTreeIds.split(",");
         List<String> idList = Arrays.asList(ids);