通讯录，调整查询

src/main/java/com/xjrsoft/module/concat/service/impl/XjrUserServiceImpl.java

@@ -47,16 +47,8 @@ public class XjrUserServiceImpl extends MPJBaseServiceImpl<XjrUserMapper, XjrUse
         }
         Set<Long> deptIds = new HashSet<>();
         for (ConcatTreeVo concatTreeVo : teacherDeptInfo) {
-            voList.add(new ConcatTreeVo(){{
-                setId(concatTreeVo.getId());
-                setName(concatTreeVo.getName());
-                setParentId(concatTreeVo.getParentId());
-                setGender(dictMap.get(concatTreeVo.getGender()));
-                setMobile(concatTreeVo.getMobile());
-            }});
             deptIds.add(concatTreeVo.getParentId());
         }
-
         departmentMapper.selectList(
             new QueryWrapper<Department>().lambda()
             .eq(Department::getDeleteMark, DeleteMark.NODELETE.getCode())
@@ -69,6 +61,18 @@ public class XjrUserServiceImpl extends MPJBaseServiceImpl<XjrUserMapper, XjrUse
             }
         });
 
+        for (ConcatTreeVo concatTreeVo : teacherDeptInfo) {
+            if(concatTreeVo.getParentId() != null){
+                voList.add(new ConcatTreeVo(){{
+                    setId(concatTreeVo.getId());
+                    setName(concatTreeVo.getName());
+                    setParentId(concatTreeVo.getParentId());
+                    setGender(dictMap.get(concatTreeVo.getGender()));
+                    setMobile(concatTreeVo.getMobile());
+                }});
+            }
+        }
+
         return voList;
     }
 }

src/main/resources/mapper/teacher/XjrUserMapper.xml

@@ -16,8 +16,9 @@
     <select id="getTeacherDeptInfo" parameterType="com.xjrsoft.module.concat.dto.ConcatTreeDto" resultType="com.xjrsoft.module.concat.vo.ConcatTreeVo">
         SELECT t1.id, t1.name,t1.mobile,t2.dept_id as parent_id,t1.gender FROM xjr_user t1
         INNER JOIN xjr_user_dept_relation t2 ON t1.id = t2.user_id
+        inner join xjr_department t4 on t2.dept_id = t4.id
         INNER JOIN base_teacher t3 ON t1.id = t3.user_id
-        WHERE t1.delete_mark = 0
+        WHERE t1.delete_mark = 0 and t4.delete_mark = 0
         <if test="dto.name != null and dto.name != ''">
             and t1.name like concat('%', #{dto.name}, '%')
         </if>