合并分支 'gwj' 到 'master'

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java

@@ -193,11 +193,13 @@ public class UserManageServiceImpl implements UserManageService {
             if(departmentIdList.contains(string)){
                 continue;
             }
+
             List<Department> departmentList = departmentDao.findAllByParentId(string);
             List<String> departments = new ArrayList<>();
             for (Department department : departmentList) {
                 departments.add(department.getId());
             }
+            departmentIdList.add(string);
             getDepartments(departmentIdList,departments);
         }
     }