人员完善,组织中

src/main/java/com/dc/dc_project/controller/sys/OrgController.java

@@ -1,8 +1,10 @@
 package com.dc.dc_project.controller.sys;
 
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.dc.dc_project.common.ResponseResult;
 import com.dc.dc_project.model.dto.OrgDto;
+import com.dc.dc_project.model.dto.OrgQueryDto;
 import com.dc.dc_project.model.pojo.Org;
 import com.dc.dc_project.service.OrgService;
 import lombok.RequiredArgsConstructor;
@@ -19,9 +21,10 @@ public class OrgController {
 
     private final OrgService orgService;
 
-    @RequestMapping("/list")
+    @RequestMapping("/tree")
-    public String list() {
+    public ResponseResult list(OrgQueryDto queryDto) {
-        return orgService.list().toString();
+        Long userId = StpUtil.getLoginIdAsLong();
+        return orgService.getList(queryDto, userId);
     }
 
     @PostMapping("/add")

src/main/java/com/dc/dc_project/mapper/OrgMapper.java

@@ -1,7 +1,9 @@
 package com.dc.dc_project.mapper;
 
+import com.dc.dc_project.model.dto.OrgQueryDto;
 import com.dc.dc_project.model.pojo.Org;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dc.dc_project.model.vo.OrgVo;
 
 import java.util.List;
 
@@ -16,6 +18,8 @@ public interface OrgMapper extends BaseMapper<Org> {
     Long getOrgIdByPersonnelId(Long id);
 
     List<Long> getCListByOrgId(Long pOrgId);
+
+    List<OrgVo> getList(OrgQueryDto queryDto);
 }
 
 

src/main/java/com/dc/dc_project/model/dto/OrgQueryDto.java

@@ -0,0 +1,34 @@
+package com.dc.dc_project.model.dto;
+
+
+import lombok.Data;
+
+@Data
+public class OrgQueryDto {
+
+    /**
+     * 组织ID
+     */
+    private Long id;
+
+
+    /**
+     * 组织名称
+     */
+    private String name;
+
+    /**
+     * 组织类型（1=公司，2=项目部，3=试验室）
+     */
+    private Integer type;
+
+    /**
+     * 组织编码
+     */
+    private String code;
+
+
+    private String remark;
+
+    private Long standardCategoryId;
+}

src/main/java/com/dc/dc_project/model/vo/OrgVo.java

@@ -1,4 +1,32 @@
 package com.dc.dc_project.model.vo;
 
-public class OrgVo {
+import com.dc.dc_project.model.TreeNode;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OrgVo implements TreeNode<OrgVo> {
+
+    private Long id;
+
+    private String name;
+
+    private String code;
+
+    private Integer type;
+
+    private Integer sortOrder;
+
+    private String remark;
+
+    private Long leaderId;
+
+    private String leaderName;
+
+    private Long parentId;
+
+    private List<OrgVo> children;
+
+
 }

src/main/java/com/dc/dc_project/service/OrgService.java

@@ -2,6 +2,7 @@ package com.dc.dc_project.service;
 
 import com.dc.dc_project.common.ResponseResult;
 import com.dc.dc_project.model.dto.OrgDto;
+import com.dc.dc_project.model.dto.OrgQueryDto;
 import com.dc.dc_project.model.pojo.Org;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -28,4 +29,11 @@ public interface OrgService extends IService<Org> {
      * @return
      */
     List<Long> getCListByOrgId(Long pOrgId);
+
+    /**
+     * 获取组织及子组织列表
+     * @param queryDto
+     * @return
+     */
+    ResponseResult getList(OrgQueryDto queryDto, Long userId);
 }

src/main/java/com/dc/dc_project/service/impl/OrgServiceImpl.java

@@ -6,8 +6,10 @@ import com.dc.dc_project.common.ResponseResult;
 import com.dc.dc_project.common.ResultCode;
 import com.dc.dc_project.enums.OrgType;
 import com.dc.dc_project.model.dto.OrgDto;
+import com.dc.dc_project.model.dto.OrgQueryDto;
 import com.dc.dc_project.model.pojo.Laboratory;
 import com.dc.dc_project.model.pojo.Org;
+import com.dc.dc_project.model.vo.OrgVo;
 import com.dc.dc_project.service.OrgService;
 import com.dc.dc_project.mapper.OrgMapper;
 import org.springframework.stereotype.Service;
@@ -68,6 +70,11 @@ public class OrgServiceImpl extends ServiceImpl<OrgMapper, Org>
         List<Long> cList = baseMapper.getCListByOrgId(pOrgId);
         return cList;
     }
+
+    @Override
+    public ResponseResult getList(OrgQueryDto queryDto, Long userId) {
+        List<OrgVo> list = baseMapper.getList(queryDto);
+    }
 }
 
 

src/main/resources/mapper/OrgMapper.xml

@@ -19,4 +19,7 @@
          inner join org or1 on o.parent_id = or1.id
         ) SELECT id from org;
     </select>
+    <select id="getList" resultType="com.dc.dc_project.model.vo.OrgVo">
+        select
+    </select>
 </mapper>