liuyc 1 年之前
父節點
當前提交
20c030b1c5

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

@@ -417,8 +417,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                     this.asyncUpdateWbsPublic(childNodesAllPublic, childNodesAllNowProjectNodes, wbsTreePrivate.getProjectId(), Integer.parseInt(wbsTreePrivate.getWbsType()));
 
                 } else if (ObjectUtil.isNotEmpty(projectInfo.getReferenceWbsTemplateIdMeter()) && (ObjectUtil.isNotEmpty(projectInfo.getReferenceWbsTemplateTypeMeter()) && ("private").equals(projectInfo.getReferenceWbsTemplateTypeMeter()))) {
-                    /*=====试验私有=====*/
-                    //私有引用试验根节点
+                    /*=====计量私有=====*/
+                    //私有引用计量根节点
                     WbsTreePrivate wbsTreePrivateRecord = wbsTreePrivateMapper.selectOne(Wrappers.<WbsTreePrivate>query().lambda().select(WbsTreePrivate::getProjectId, WbsTreePrivate::getWbsId).eq(WbsTreePrivate::getPKeyId, projectInfo.getReferenceWbsTemplateIdMeter()).eq(WbsTreePrivate::getStatus, 1));
                     //引用模板的对应节点
                     WbsTreePrivate recordSelectNode = wbsTreePrivateMapper.selectOne(Wrappers.<WbsTreePrivate>lambdaQuery().eq(WbsTreePrivate::getId, wbsTreePrivate.getId()).eq(WbsTreePrivate::getProjectId, wbsTreePrivateRecord.getProjectId()).eq(WbsTreePrivate::getWbsId, wbsTreePrivateRecord.getWbsId()));

+ 3 - 3
blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MeterTreeController.java

@@ -227,7 +227,7 @@ public class MeterTreeController extends BladeController {
     @PostMapping("/system/sort")
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "系统树节点同级排序", notes = "传入节点ids逗号拼接字符串,按照顺序从上到下")
-    public R<Object> systemSort(@RequestBody String ids) {
+    public R<Object> systemSort(@RequestParam String ids) {
         if (StringUtils.isNotEmpty(ids)) {
             String[] split = ids.split(",");
             int sort = 1;
@@ -400,7 +400,7 @@ public class MeterTreeController extends BladeController {
     @PostMapping("/project/sort")
     @ApiOperationSupport(order = 19)
     @ApiOperation(value = "项目树节点同级排序", notes = "传入节点ids逗号拼接字符串,按照顺序从上到下")
-    public R<Object> projectSort(@RequestBody String ids) {
+    public R<Object> projectSort(@RequestParam String ids) {
         if (StringUtils.isNotEmpty(ids)) {
             String[] split = ids.split(",");
             int sort = 1;
@@ -595,7 +595,7 @@ public class MeterTreeController extends BladeController {
     @PostMapping("/contract/sort")
     @ApiOperationSupport(order = 28)
     @ApiOperation(value = "合同段树节点同级排序", notes = "传入节点ids逗号拼接字符串,按照顺序从上到下")
-    public R<Object> contractSort(@RequestBody String ids) {
+    public R<Object> contractSort(@RequestParam String ids) {
         if (StringUtils.isNotEmpty(ids)) {
             String[] split = ids.split(",");
             int sort = 1;