|
|
@@ -291,10 +291,23 @@ public class UserController extends BaseController {
|
|
|
deptId = agent.getDeptId();
|
|
|
}
|
|
|
}else{
|
|
|
+ if (null!=user.getDeptId()){
|
|
|
+ deptId = user.getDeptId();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if(null==deptId&&UserTypeEnum.isTeacher(user.getUserType())){
|
|
|
+ DzTeacher teacher = dzTeacherService.selectDzTeacherByUserId(user.getUserId());
|
|
|
+ if(null != teacher && null != teacher.getDeptId()){
|
|
|
+ deptId = teacher.getDeptId();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null==deptId){
|
|
|
//默认使用单招一卡通
|
|
|
deptId = 101L;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// 构建组织信息对象
|
|
|
// 查询机构信息
|
|
|
SysDept dept = deptService.selectDeptById(deptId);
|