item：视频监控bug修复

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/VideoDTO.java

@@ -15,4 +15,6 @@ public class VideoDTO extends BaseDTO<Video> {
      * 监控
      */
     Video video;
+
+    String orgTypes;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/VideoMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 @Mapper
 public interface VideoMapper extends BaseMapper<Video> {
-    Page<PageVideoVO> pageVideo(@Param("page")IPage<Video> page, @Param("video")Video video);
+    Page<PageVideoVO> pageVideo(@Param("page") IPage<Video> page, @Param("video") Video video, @Param("list") List<String> bizOrgCodeList);
 
     Page<BuildingVideoVO> pageBuildingVideo(@Param("page") Page page, @Param("dto") BuildingVideoListVO dto);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
+import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
 import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.VideoDTO;
 import com.yeejoin.equipmanage.common.entity.dto.VideoSaveDto;
@@ -23,6 +24,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -201,7 +203,17 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
 
     @Override
     public Page<PageVideoVO> pageVideo(VideoDTO videoDTO) {
-        return this.baseMapper.pageVideo(videoDTO.getPage(), videoDTO.getVideo());
+        Video video = videoDTO.getVideo();
+        String orgTypes = videoDTO.getOrgTypes();
+        String bizOrgCode = video.getBizOrgCode();
+        List<String> bizOrgCodeList = new ArrayList<>();
+        if (!StringUtils.isNotBlank(bizOrgCode)) {
+            List<OrgUsrDto> list = jcsRemoteService.getCompanyDeptListWithAuth(authKey, orgTypes);
+            if (!CollectionUtils.isEmpty(list)) {
+                list.stream().filter(o -> StringUtils.isNotBlank(o.getBizOrgCode())).forEach(x -> bizOrgCodeList.add(x.getBizOrgCode()));
+            }
+        }
+        return this.baseMapper.pageVideo(videoDTO.getPage(), video, bizOrgCodeList);
     }
 
     @Override

amos-boot-system-equip/src/main/resources/mapper/VideoMapper.xml

@@ -48,7 +48,13 @@
             and wlv.type_code like concat('%',#{video.typeCode},'%')
         </if>
         <if test="video!=null and video.bizOrgCode!=null and video.bizOrgCode!=''">
-            and wlv.biz_org_code = #{video.bizOrgCode}
+            and wlv.biz_org_code LIKE CONCAT(#{video.bizOrgCode}, '%')
+        </if>
+        <if test="list != null and list.size() >0">
+            and wlv.biz_org_code IN
+            <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         group by  wlv.id
         order by wlv.create_date desc