实验室下拉接口-树形结构

src/main/java/org/springblade/modules/system/controller/DeptController.java

@@ -188,5 +188,13 @@ public class DeptController extends BladeController {
         return R.data(list);
     }
 
+    /**
+     * 实验室下拉
+     */
+    @GetMapping("/limsTree")
+    public R<List<DeptVO>> limsTree(String tenantId) {
+        List<DeptVO> tree = deptService.limsTree(Func.toStrWithEmpty(tenantId, "000000"));
+        return R.data(tree);
+    }
 
 }

src/main/java/org/springblade/modules/system/mapper/DeptMapper.java

@@ -56,6 +56,7 @@ public interface DeptMapper extends BaseMapper<Dept> {
 	 * @return
 	 */
 	List<DeptVO> tree(String tenantId);
+	List<DeptVO> limsTree(String tenantId);
 
 	/**
 	 * 懒加载获取树形节点

src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml

@@ -74,6 +74,14 @@
         ORDER BY sort
     </select>
 
+    <select id="limsTree" resultMap="treeNodeResultMap">
+        select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0 and dept_category in (5,6)
+        <if test="_parameter!=null and _parameter!=''">
+            and tenant_id = #{_parameter}
+        </if>
+        ORDER BY sort
+    </select>
+
     <select id="lazyTree" resultMap="treeNodeResultMap" >
         SELECT
             dept.id,

src/main/java/org/springblade/modules/system/pojo/entity/Dept.java

@@ -124,7 +124,7 @@ public class Dept implements Serializable {
 	 * 部门种类
 	 * 实验室，房间
 	 */
-	private Integer deptCat;
+//	private Integer deptCat;
 
 
 }

src/main/java/org/springblade/modules/system/service/IDeptService.java

@@ -133,4 +133,5 @@ public interface IDeptService extends IService<Dept> {
 	 */
 	List<DeptVO> search(String deptName, Long parentId);
 
+	List<DeptVO> limsTree(String tenantId);
 }

src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java

@@ -183,4 +183,9 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		return DeptWrapper.build().listNodeVO(deptList);
 	}
 
+	@Override
+	public List<DeptVO> limsTree(String tenantId) {
+		return ForestNodeMerger.merge(baseMapper.limsTree(tenantId));
+	}
+
 }