修复

whycxzp

2022-09-08 72d1465f0d04e9fd9ac5255dab1e3fda373d9a26

 src/main/java/com/whyc/service/SoftwareService.java

@@ -91,14 +91,22 @@

    }
    //查询软件列表的信息
    public Response getAllSoftware(String fileName, int pageCurr, int pageSize) {
    public Response getAllSoftware(String fileName,String applyMaterialCode,String applyModel,String owner, int pageCurr, int pageSize) {
        PageHelper.startPage(pageCurr,pageSize);
        QueryWrapper wrapper=new QueryWrapper();
        if(fileName!=null&&!fileName.isEmpty()){
            wrapper.like("file_name",fileName);
        }
        wrapper.orderByAsc("file_name");
        wrapper.orderByAsc("version");
        if(applyMaterialCode!=null&&!applyMaterialCode.isEmpty()){
            wrapper.like("apply_material_code",applyMaterialCode);
        }
        if(applyModel!=null&&!applyModel.isEmpty()){
            wrapper.like("apply_model",applyModel);
        }
        if(owner!=null&&!owner.isEmpty()){
            wrapper.like("owner",owner);
        }
        wrapper.orderByDesc("create_time");
        List list=mapper.selectList(wrapper);
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list.size()>0,pageInfo,"软件信息返回");
@@ -158,7 +166,7 @@
        file2Name = file2Name.substring(0,file2Name.lastIndexOf(".")) + "_" + dateUnion +file2Name.substring(file2Name.lastIndexOf("."));
        //存储路径
        String rootFile = CommonUtil.getRootFile();
        String softwareDir = rootFile + "software" + File.separator + software.getOwner() + File.separator + dateUnion;
        String softwareDir = rootFile + "software" + File.separator + software.getOwner();
        String softwareHttpUrl = softwareDir.substring(softwareDir.lastIndexOf("doc_file"+ File.separator + "software"));
        File softwareDirFile = new File(softwareDir);
        if(!softwareDirFile.exists()){