fix

zhanzhiqin

2022-09-16 d20202956f68bd5a7ea98d70f1ff11fe99cf9e5c

fix

 dao/src/main/java/com/sandu/ximon/dao/mapper/PlatformFileMapper.java

@@ -16,7 +16,7 @@
@Mapper
public interface PlatformFileMapper extends BaseMapper<PlatformFile> {

    List<PlatformFileListBo> fileLiet(String keyword, Long userId);
    List<PlatformFileListBo> fileList(String keyword, List<Long> fileIdList);
}



 dao/src/main/resources/mapper/PlatformFileMapper.xml

@@ -18,22 +18,19 @@
        ,file_name,file_size,
        create_time,update_time
    </sql>
    <select id="fileLiet" resultType="com.sandu.ximon.dao.bo.PlatformFileListBo">

    <select id="fileList" resultType="com.sandu.ximon.dao.bo.PlatformFileListBo">
        SELECT
        *
        FROM
        platform_file t1
        LEFT JOIN platform_file_user t2 ON t1.file_Id = t2.file_Id
        WHERE
        1 =1
        <if test="userId!=null">
            AND
            t2.user_id = #{userId}
        </if>
        <if test="keyword != null and keyword != ''">
            AND (
            t1.file_name LIKE CONCAT('%', #{keyword},'%')
            )
        </if>
        <where>
            <if test="fileIdList!=null">
                t1.file_id IN
                <foreach collection="fileIdList" open="(" close=")" item="fileId" separator=",">
                    #{fileId}
                </foreach>
            </if>
        </where>
    </select>
</mapper>

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java

@@ -8,15 +8,13 @@
import com.sandu.common.file.impl.AliOssFileServiceImpl;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.AllUserInfoParam;
import com.sandu.ximon.admin.param.EditFileParam;
import com.sandu.ximon.admin.param.PlatformFilePermissionParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.bo.PlatformFileListBo;
import com.sandu.ximon.dao.domain.Admin;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.PlatformFile;
import com.sandu.ximon.dao.domain.PlatformFileUser;
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.PlatformFileMapper;
import lombok.AllArgsConstructor;
@@ -116,10 +114,18 @@
        List<PlatformFileListBo> platformFileListBos;
        if (AdministratorEnums.ADMIN.getCode().equals(SecurityUtils.getUserDetails().getAdministratorType())) {
            PageHelper.startPage(vo.getPageNo(), vo.getPageSize());
            platformFileListBos = baseMapper.fileLiet(keyword, null);
            platformFileListBos = baseMapper.fileList(keyword, null);
        } else {
            List<PlatformFileUser> platformFileUsers = SpringContextHolder.getBean(PlatformFileUserService.class)
                    .list(Wrappers.lambdaQuery(PlatformFileUser.class).eq(PlatformFileUser::getUserId, SecurityUtils.getUserId()));
            List<Long> fileIdList = platformFileUsers.stream().map(PlatformFileUser::getFileId).collect(Collectors.toList());

            if(fileIdList.size() == 0){
                fileIdList.add(-1L);
            }
            PageHelper.startPage(vo.getPageNo(), vo.getPageSize());
            platformFileListBos = baseMapper.fileLiet(keyword, SecurityUtils.getUserId());
            platformFileListBos = baseMapper.fileList(keyword, fileIdList);

        }
        return platformFileListBos;
    }