机构查询的修改

tenant/organization/src/main/java/com/jzg/organization/controller/DeptController.java

@@ -3,7 +3,6 @@ package com.jzg.organization.controller;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.organization.entity.po.SysDept;
-import com.jzg.organization.entity.vo.DeptVo;
 import com.jzg.organization.entity.vo.SysDeptVo;
 import com.jzg.organization.service.SysDeptService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -69,7 +68,7 @@ public class DeptController extends BaseController {
      */
     @PostMapping("/tree")
     @Operation(summary = "查询租户机构树")
-    public HttpResult<List<DeptVo>> tree(String systemCode) {
+    public HttpResult<List<SysDept>> tree(String systemCode) {
         return HttpResult.ok(sysDeptService.tree(systemCode));
     }
 

tenant/organization/src/main/java/com/jzg/organization/entity/vo/DeptVo.java

@@ -1,20 +0,0 @@
-package com.jzg.organization.entity.vo;
-
-import com.jzg.organization.entity.po.SysDept;
-import com.mldong.modules.sys.entity.Dept;
-import io.swagger.annotations.ApiModel;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-/**
- * <p>
- * 部门
- * </p>
- *
- * @author mldong
- * @since 2023-09-20
- */
-@Data
-@Schema(description = "部门VO")
-public class DeptVo extends SysDept {
-}

tenant/organization/src/main/java/com/jzg/organization/service/SysDeptService.java

@@ -1,10 +1,8 @@
 package com.jzg.organization.service;
 
-import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.organization.entity.po.SysDept;
-import com.jzg.organization.entity.vo.DeptVo;
 import com.jzg.organization.entity.vo.SysDeptVo;
 
 import java.util.List;
@@ -46,5 +44,5 @@ public interface SysDeptService extends IService<SysDept> {
      * @param systemCode
      * @return
      */
-    List<DeptVo> tree(String systemCode);
+    List<SysDept> tree(String systemCode);
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysDeptServiceImpl.java

@@ -1,8 +1,6 @@
 package com.jzg.organization.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,14 +11,11 @@ import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.commons.util.tree.TreeTool;
 import com.jzg.organization.entity.po.SysDept;
 import com.jzg.organization.entity.po.SysSystem;
-import com.jzg.organization.entity.po.SysUser;
-import com.jzg.organization.entity.vo.DeptVo;
 import com.jzg.organization.entity.vo.SysDeptVo;
 import com.jzg.organization.entity.vo.SysUserVo;
 import com.jzg.organization.mapper.SysDeptMapper;
 import com.jzg.organization.service.SysDeptService;
 import com.jzg.commons.util.AssertionUtils;
-import com.jzg.commons.util.TreeBuildUtils;
 import com.jzg.organization.service.SysSystemService;
 import com.jzg.organization.service.SysUserService;
 import org.springframework.beans.BeanUtils;
@@ -169,10 +164,10 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     }
 
     @Override
-    public List<DeptVo> tree(String systemCode) {
+    public List<SysDept> tree(String systemCode) {
         LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(systemCode);
         List<SysDept> depts = sysDeptMapper.selectDeptList(lqw);
-        List<DeptVo> treeData = TreeTool.listToTree(BeanUtil.copyToList(depts, DeptVo.class),0L,DeptVo.class);
+        List<SysDept> treeData = TreeTool.listToTree(BeanUtil.copyToList(depts, SysDept.class),0L,SysDept.class);
         return treeData;
     }