fix bug

server-service/src/main/java/com/makeit/mapper/platform/space/PlatBedMapper.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.makeit.dto.platform.space.PlatBedPanoramaDTO;
 import com.makeit.dto.platform.space.PlatBedQueryDTO;
 import com.makeit.dto.platform.workstation.WorkStationQueryDTO;
-import com.makeit.dto.saas.SaasOperationLogDTO;
 import com.makeit.entity.platform.space.PlatBed;
 import com.makeit.vo.platform.space.PlatBedPanoramaVO;
 import com.makeit.vo.platform.space.PlatBedVo;

server-service/src/main/java/com/makeit/service/platform/workstation/impl/WorkStationServiceImpl.java

@@ -178,10 +178,18 @@ public class WorkStationServiceImpl implements WorkStationService {
             }
             List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
             dto.setOrgIds(orgIds);
+        }else {
+            List<PlatOrg> orgs = platOrgService.list(new QueryWrapper<PlatOrg>().lambda()
+                    .eq(PlatOrg::getId, dto.getOrgIds()));
+            List<String> orgIds = orgs.stream().filter(t->PlatOrgEnum.OrgTypeEnum.INSTITUTION.getValue().equals(t.getType()))
+                    .map(PlatOrg::getId).collect(Collectors.toList());
+            if(orgIds.isEmpty()){
+                return new PageVO<>();
+            }
+            dto.setOrgIds(orgIds);
         }
 
         if (dto.getSpaceIds().isEmpty()) {
-
             spaces = platSpaceService.list(new QueryWrapper<PlatSpace>().lambda()
                     .in(PlatSpace::getOrgId, dto.getOrgIds()));
             if (spaces.isEmpty()) {
@@ -475,6 +483,15 @@ public class WorkStationServiceImpl implements WorkStationService {
             }
             List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
             dto.setOrgIds(orgIds);
+        }else {
+            List<PlatOrg> orgs = platOrgService.list(new QueryWrapper<PlatOrg>().lambda()
+                    .eq(PlatOrg::getId, dto.getOrgIds()));
+            List<String> orgIds = orgs.stream().filter(t->PlatOrgEnum.OrgTypeEnum.HOME.getValue().equals(t.getType()))
+                    .map(PlatOrg::getId).collect(Collectors.toList());
+            if(orgIds.isEmpty()){
+                return new PageVO<>();
+            }
+            dto.setOrgIds(orgIds);
         }
 
         if (dto.getSpaceIds().isEmpty()) {

server-service/src/main/resources/mappers/PlatBedMapper.xml

@@ -3,24 +3,10 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.makeit.mapper.platform.space.PlatBedMapper">
-    <resultMap id="BaseResultMap" type="com.makeit.entity.platform.space.PlatBed">
-        <id property="id" column="id" jdbcType="VARCHAR"/>
-        <result property="tenantId" column="tenant_id" jdbcType="VARCHAR"/>
-        <result property="name" column="name" jdbcType="VARCHAR"/>
-        <result property="roomId" column="room_id" jdbcType="VARCHAR"/>
-        <result property="spaceId" column="space_id" jdbcType="VARCHAR"/>
-        <result property="status" column="status" jdbcType="VARCHAR"/>
-        <result property="sort" column="sort" jdbcType="VARCHAR"/>
-        <result property="createDate" column="create_date" jdbcType="TIMESTAMP"/>
-        <result property="updateDate" column="update_date" jdbcType="TIMESTAMP"/>
-        <result property="update_by" column="update_by" jdbcType="VARCHAR"/>
-        <result property="sort" column="sort" jdbcType="VARCHAR"/>
-        <result property="delFlag" column="del_flag" jdbcType="CHAR"/>
-    </resultMap>
 
     <select id="selectBySpaceIdAndStatus" resultType="com.makeit.vo.platform.space.PlatBedPanoramaVO">
-        SELECT pb.id,pb.`status`,pb.name as bedName ,pm.`name` as roomName,pm.space_path as spacePath,pe.name as elderName,pe.id as elderId,pm.id as roomId
-        FROM `plat_bed` pb
+        SELECT pb.id,pb.status,pb.name as bedName ,pm.name as roomName,pm.space_path as spacePath,pe.name as elderName,pe.id as elderId,pm.id as roomId
+        FROM plat_bed pb
         LEFT JOIN plat_room pm on pb.room_id = pm.id
         LEFT JOIN plat_elder pe on pe.bed_id = pb.id
         <where>
@@ -35,8 +21,8 @@
     </select>
 
     <select id="selectByRoomIdAndStatus" resultType="com.makeit.vo.platform.space.PlatBedPanoramaVO">
-        SELECT pb.id,pb.`status`,pb.name as bedName ,pm.`name` as roomName,pm.space_path as spacePath,pe.name as elderName,pe.id as elderId,pm.id as roomId
-        FROM `plat_bed` pb
+        SELECT pb.id,pb.status,pb.name as bedName ,pm.name as roomName,pm.space_path as spacePath,pe.name as elderName,pe.id as elderId,pm.id as roomId
+        FROM plat_bed pb
         LEFT JOIN plat_room pm on pb.room_id = pm.id
         LEFT JOIN plat_elder pe on pe.bed_id = pb.id and pe.del_flag = 0
         <where>