push

src/main/java/com/yxproject/start/mapper/FileNameDicMapper.java

@@ -60,7 +60,7 @@ public interface FileNameDicMapper {
      */
     @Select("<script> select FILE_NAME_DIC.*,rownum rn from FILE_NAME_DIC " +
             "<where> 1=1 " +
-            "<if test='analysisState != -1' >" +
+            "<if test='analysisState != -1 ' >" +
             " and STATE =#{analysisState}" +
             "</if>" +
             "<if test='uploadDate !=\"\"' >" +

src/main/java/com/yxproject/start/service/impl/FileNameDicServiceImpl.java

@@ -28,18 +28,10 @@ public class FileNameDicServiceImpl implements FileNameDicService {
 
     @Override
     public List<FileNameDicEntity> queryFileNameDic(String uploadDate,String fileName, long analysisState, long currPage, long pageSize) {
-//        if (analysisState<0){
-//            analysisState=2;
-//        }
-//        List<FileNameDicEntity> fileNameDicEntities = fileNameDicMapper.queryFileNameDic(uploadDate, fileName, -1, currPage * pageSize, (currPage - 1) * pageSize + 1);
-        return fileNameDicMapper.queryFileNameDic(uploadDate,fileName, -1, currPage*pageSize,(currPage-1)*pageSize+1 );
-//        return null;
+        return fileNameDicMapper.queryFileNameDic(uploadDate,fileName, analysisState, currPage*pageSize,(currPage-1)*pageSize+1 );
     }
     @Override
     public int queryFileNameDicCount(String uploadDate,String fileName, long analysisState) {
-//        if (analysisState<0){
-//            analysisState=2;
-//        }
         return fileNameDicMapper.queryFileNameDicCount(uploadDate,fileName, analysisState ).size();
     }