Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/room/controller/RoomBedAdjustController.java

@@ -90,10 +90,6 @@ public class RoomBedAdjustController {
             if(classList != null && !classList.isEmpty()){
                 dto.setClassId(classList.get(0).getId());
             }
-        }else{
-            if(classList != null && !classList.isEmpty() &&  dto.getClassId() == null){
-                dto.setClassId(classList.get(0).getId());
-            }
         }
         List<AdjustBedStudentPageVo> result = roomBedService.getBedStudetInfo(dto);
         if (result == null) {
@@ -102,6 +98,24 @@ public class RoomBedAdjustController {
         return RT.ok(result);
     }
 
+    @GetMapping(value = "/is-class-teacher")
+    @ApiOperation(value="判断登录者是否是班主任")
+    @SaCheckPermission("roomBedAdjust:detail")
+    public RT<Integer> getLoginRole(@Valid AdjustBedPageDto dto){
+        List<String> roleList = StpUtil.getRoleList();
+
+        long teacherId = StpUtil.getLoginIdAsLong();
+        List<BaseClass> classList = baseClassService.list(
+                new QueryWrapper<BaseClass>().lambda().eq(BaseClass::getTeacherId, teacherId)
+        );
+        if(roleList.size() == 2 && roleList.contains("CLASSTE") && roleList.contains("TEACHER")){
+            if(classList != null && !classList.isEmpty()){
+                RT.ok(1);
+            }
+        }
+        return RT.ok(0);
+    }
+
     @GetMapping(value = "/no-bed-student")
     @ApiOperation(value="未分配床位的学生(分页)")
     @SaCheckPermission("roomBedAdjust:detail")

src/main/resources/mapper/room/RoomMapper.xml

@@ -69,7 +69,7 @@
         ) class_data
         ) AS class_count FROM room
         where 1 = 1
-        <if test="ids != null">
+        <if test="ids != null and ids.size() > 0">
             and id in
             <foreach item="roomId" index="index" collection="ids" open="(" close=")" separator=",">
                 #{roomId}