通讯录调整

src/main/java/com/xjrsoft/module/concat/controller/ConcatController.java

@@ -1,11 +1,16 @@
 package com.xjrsoft.module.concat.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.module.concat.dto.ConcatTreeDto;
 import com.xjrsoft.module.concat.service.IXjrUserService;
 import com.xjrsoft.module.concat.vo.ConcatTreeVo;
+import com.xjrsoft.module.organization.entity.Department;
+import com.xjrsoft.module.organization.service.IDepartmentService;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -13,6 +18,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -27,14 +33,45 @@ import java.util.List;
 @AllArgsConstructor
 public class ConcatController {
     private final IXjrUserService xjrUserService;
+    private final IDepartmentService departmentService;
 
 
     @GetMapping(value = "/list")
     @ApiOperation(value="教师通讯录")
     @SaCheckPermission("room:detail")
     public RT<List<ConcatTreeVo>> list(ConcatTreeDto dto) throws Exception {
-        List<ConcatTreeVo> concatList = xjrUserService.getConcatList(dto);
-        List<ConcatTreeVo> treeVoList = TreeUtil.build(concatList);
-        return RT.ok(treeVoList);
+        Long parentId = 0L;
+        if(dto.getDeptId() != null){
+            parentId = dto.getDeptId();
+        }
+        List<Department> list = departmentService.list(
+            new QueryWrapper<Department>().lambda()
+            .eq(Department::getParentId, parentId)
+        );
+        List<ConcatTreeVo> concatList = new ArrayList<>();
+        for (Department department : list) {
+            concatList.add(
+                new ConcatTreeVo(){{
+                    setName(department.getName());
+                    setId(department.getId());
+                    setType(1);
+                }}
+            );
+        }
+        MPJLambdaWrapper<XjrUser> wrapper = new MPJLambdaWrapper<>();
+        wrapper.leftJoin("xjr_user_dept_relation t2 on t.id = t2.user_id")
+                .eq("t2.dept_id", parentId);
+        List<XjrUser> userList = xjrUserService.selectJoinList(XjrUser.class, wrapper);
+        for (XjrUser user : userList) {
+            concatList.add(
+                    new ConcatTreeVo(){{
+                        setName(user.getName());
+                        setMobile(user.getMobile());
+                        setType(2);
+                    }}
+            );
+        }
+
+        return RT.ok(concatList);
     }
 }

src/main/java/com/xjrsoft/module/concat/dto/ConcatTreeDto.java

@@ -20,4 +20,7 @@ public class ConcatTreeDto extends PageInput {
     @ApiModelProperty("电话")
     private String mobile;
 
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
 }

src/main/java/com/xjrsoft/module/concat/vo/ConcatTreeVo.java

@@ -20,7 +20,7 @@ public class ConcatTreeVo implements ITreeNode<ConcatTreeVo, Long>, Serializable
     @ApiModelProperty("电话")
     private String mobile;
 
-    @ApiModelProperty("id")
+    @ApiModelProperty("id(type=1时为部门id)")
     private Long id;
 
     @ApiModelProperty("disabled")
@@ -32,4 +32,7 @@ public class ConcatTreeVo implements ITreeNode<ConcatTreeVo, Long>, Serializable
     @ApiModelProperty("性别")
     private String gender;
 
+    @ApiModelProperty("类别（1:部门 2:教室）")
+    private Integer type;
+
 }