update

edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/RoomController.java

@@ -44,7 +44,7 @@ public class RoomController{
     @RequestMapping(value = "/leave", method = RequestMethod.POST)
     public Object leaveRoom(@RequestBody ReqUserData data)
             throws ApiException, Exception {
-        boolean result = roomService.leaveRoom(data.getRoomId());
+        boolean result = roomService.leaveRoom(data.getRoomId(),data.getUserId());
         return new BaseResponse<>(result);
     }
 

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -1,10 +1,8 @@
 package com.keao.edu.im.service.Impl;
 
-import com.keao.edu.common.enums.YesOrNoEnum;
-import com.keao.edu.user.api.client.EduUserFeignService;
 import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.auth.api.entity.SysUser;
+import com.keao.edu.common.enums.YesOrNoEnum;
 import com.keao.edu.common.exception.BizException;
 import com.keao.edu.im.common.ApiException;
 import com.keao.edu.im.common.ErrorEnum;
@@ -20,6 +18,8 @@ import com.keao.edu.im.utils.CodeUtil;
 import com.keao.edu.im.utils.DateTimeUtils;
 import com.keao.edu.im.utils.IdentifierUtils;
 import com.keao.edu.im.whiteboard.WhiteBoardHelper;
+import com.keao.edu.user.api.client.EduUserFeignService;
+import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -321,12 +321,17 @@ public class RoomServiceImpl implements RoomService {
 
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     @Override
-    public Boolean leaveRoom(String roomId){
-        SysUser user = sysUserFeignService.queryUserInfo();
-        String userId = user.getId().toString();
+    public Boolean leaveRoom(String roomId,String userId){
+        SysUser user = null;
+        if(StringUtils.isEmpty(userId)){
+            user = sysUserFeignService.queryUserInfo();
+            userId = user.getId().toString();
+        }else {
+            user = sysUserFeignService.queryUserById(Integer.parseInt(userId));
+        }
         log.info("leaveRoom: roomId={}, userId={}", roomId,userId);
 
-        CheckUtils.checkArgument(user != null, "user must't be null");
+        CheckUtils.checkArgument(userId != null, "userId must't be null");
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         List<Room> roomList = roomDao.findByRid(roomId);
         if (roomList.size() == 0) {

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/RoomService.java

@@ -21,7 +21,7 @@ public interface RoomService {
 
     void signOut(Long roomId);
 
-    public Boolean leaveRoom(String roomId) throws ApiException, Exception;
+    public Boolean leaveRoom(String roomId,String userId) throws ApiException, Exception;
 
     //only host
     public Boolean downgrade(String roomId, List<ReqChangeUserRoleData.ChangedUser> users) throws ApiException, Exception;

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/SubjectController.java

@@ -4,6 +4,7 @@ package com.keao.edu.user.controller;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.user.entity.Subject;
 import com.keao.edu.user.page.SubjectQueryInfo;
 import com.keao.edu.user.service.SubjectService;
@@ -28,6 +29,7 @@ public class SubjectController extends BaseController {
     @PostMapping("/upset")
     @PreAuthorize("@pcs.hasPermissions('subject/upset')")
     public HttpResponseResult update(@RequestBody Subject subject){
+        subject.setTenantId(TenantContextHolder.getTenantId().toString());
         subjectService.upSetSubject(subject);
         return succeed();
     }

edu-user/edu-user-server/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -31,8 +31,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.keao.edu.user.entity.Subject" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO subject (id_,name_,code_,parent_subject_id_,img_,create_time_,update_time_,tenant_id_,tenant_id_)
-        VALUES(#{id},#{name},#{code},#{parentSubjectId},#{img},now(),now(),#{tenantId},#{tenantId})
+        INSERT INTO subject (id_,name_,code_,parent_subject_id_,img_,create_time_,update_time_,tenant_id_)
+        VALUES(#{id},#{name},#{code},#{parentSubjectId},#{img},now(),now(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->