From d866e43afbe901bfc640776e02f767b9045acbc2 Mon Sep 17 00:00:00 2001 From: 赵文轩 <1652863494@qq.com> Date: 星期三, 12 六月 2024 09:04:56 +0800 Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java index 9b12ca8..11d6d05 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java @@ -1510,7 +1510,10 @@ // } TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId); - List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId); + +// List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId); + List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId,tjNumber); + if (null == proParentList || proParentList.size()==0) { Map<String, Object> map = new HashMap<>(); map.put("xiaoJieIds", null); -- Gitblit v1.8.0