通讯录，新增性别字段

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

@@ -17,8 +17,10 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
 * @Author dzx
@@ -43,16 +45,7 @@ public class XjrUserServiceImpl extends MPJBaseServiceImpl<XjrUserMapper, XjrUse
         for (DictionaryDetail detail : detailList) {
             dictMap.put(detail.getCode(), detail.getName());
         }
-
-        departmentMapper.selectList(
-            new QueryWrapper<Department>().lambda()
-            .eq(Department::getDeleteMark, DeleteMark.NODELETE.getCode())
-        ).forEach((node) -> {
-            voList.add(new ConcatTreeVo(){{
-                setId(node.getId());
-                setName(node.getName());
-            }});
-        });
+        Set<Long> deptIds = new HashSet<>();
         for (ConcatTreeVo concatTreeVo : teacherDeptInfo) {
             voList.add(new ConcatTreeVo(){{
                 setId(concatTreeVo.getId());
@@ -61,7 +54,21 @@ public class XjrUserServiceImpl extends MPJBaseServiceImpl<XjrUserMapper, XjrUse
                 setGender(dictMap.get(concatTreeVo.getGender()));
                 setMobile(concatTreeVo.getMobile());
             }});
+            deptIds.add(concatTreeVo.getParentId());
         }
+
+        departmentMapper.selectList(
+            new QueryWrapper<Department>().lambda()
+            .eq(Department::getDeleteMark, DeleteMark.NODELETE.getCode())
+        ).forEach((node) -> {
+            if(deptIds.contains(node.getId())){
+                voList.add(new ConcatTreeVo(){{
+                    setId(node.getId());
+                    setName(node.getName());
+                }});
+            }
+        });
+
         return voList;
     }
 }