代理商与老师登录app时无org信息

ie-admin/src/main/java/com/ruoyi/web/controller/front/UserController.java

@@ -13,7 +13,6 @@ import com.ruoyi.common.core.domain.model.LoginCard;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.AccessFromType;
-import com.ruoyi.common.enums.AccountType;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.enums.ExamType;
 import com.ruoyi.common.utils.NumberUtils;
@@ -283,18 +282,27 @@ public class UserController extends BaseController {
             }
         }
 
-        // 通过代理商查询机构信息
-        Long deptId = null;
+        // 通过代理商查询机构信息，默认使用单招一卡通
+        Long deptId = 101L;
         if (null != agentId&&0!=agentId) {
             DzAgent agent = agentService.selectDzAgentByAgentId(agentId);
             if(null != agent && null != agent.getDeptId()) {
                 deptId = agent.getDeptId();
             }
         }else{
-            //默认使用单招一卡通
-            deptId = 101L;
+            if (UserTypeEnum.isTeacher(user.getUserType())){
+                DzTeacher teacher = dzTeacherService.selectDzTeacherByUserId(user.getUserId());
+                if(null != teacher && null != teacher.getDeptId()) {
+                    deptId = teacher.getDeptId();
+                }
+            }else if (UserTypeEnum.isAgent(user.getUserType())){
+                DzAgent agent = agentService.selectDzAgentByUserId(user.getUserId());
+                if(null != agent && null != agent.getDeptId()) {
+                    deptId = agent.getDeptId();
+                }
+            }
         }
-        
+
         // 构建组织信息对象
         // 查询机构信息
         SysDept dept = deptService.selectDeptById(deptId);

ie-system/src/main/java/com/ruoyi/dz/mapper/DzTeacherMapper.java

@@ -19,6 +19,14 @@ public interface DzTeacherMapper
      */
     public DzTeacher selectDzTeacherByTeacherId(Long teacherId);
 
+    /**
+     * 根据用户ID查询老师
+     * 
+     * @param userId 用户ID
+     * @return 老师
+     */
+    public DzTeacher selectDzTeacherByUserId(Long userId);
+
     /**
      * 查询老师列表
      * 

ie-system/src/main/java/com/ruoyi/dz/service/IDzTeacherService.java

@@ -19,6 +19,14 @@ public interface IDzTeacherService
      */
     public DzTeacher selectDzTeacherByTeacherId(Long teacherId);
 
+    /**
+     * 根据用户ID查询老师
+     *
+     * @param userId 用户ID
+     * @return 老师
+     */
+    public DzTeacher selectDzTeacherByUserId(Long userId);
+
     /**
      * 查询老师列表
      *

ie-system/src/main/java/com/ruoyi/dz/service/impl/DzTeacherServiceImpl.java

@@ -45,6 +45,18 @@ public class DzTeacherServiceImpl implements IDzTeacherService
         return dzTeacherMapper.selectDzTeacherByTeacherId(teacherId);
     }
 
+    /**
+     * 根据用户ID查询老师
+     *
+     * @param userId 用户ID
+     * @return 老师
+     */
+    @Override
+    public DzTeacher selectDzTeacherByUserId(Long userId)
+    {
+        return dzTeacherMapper.selectDzTeacherByUserId(userId);
+    }
+
     /**
      * 查询老师列表
      *

ie-system/src/main/resources/mapper/dz/DzTeacherMapper.xml

@@ -42,6 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where t1.teacher_id = #{teacherId}
     </select>
 
+    <select id="selectDzTeacherByUserId" parameterType="Long" resultMap="DzTeacherResult">
+        <include refid="selectDzTeacherVo"/>
+        where t1.user_id = #{userId}
+    </select>
+
     <insert id="insertDzTeacher" parameterType="DzTeacher" useGeneratedKeys="true" keyProperty="teacherId">
         insert into dz_teacher
         <trim prefix="(" suffix=")" suffixOverrides=",">