Merge remote-tracking branch 'origin/dev' into dev

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

@@ -168,7 +168,7 @@ public interface LogMapper {
 
 
     //查询身份数据
-    @Select("select PREPRO_PERSON.JMSFZSLH, PREPRO_PERSON.GMSFHM,PREPRO_PERSON.YXQQSRQ,PREPRO_PERSON.YXQJZRQ,PREPRO_PERSON.SSXQDM FROM PREPRO_PERSON " +
+    @Select("select distinct PREPRO_PERSON.JMSFZSLH, PREPRO_PERSON.GMSFHM,PREPRO_PERSON.YXQQSRQ,PREPRO_PERSON.YXQJZRQ,PREPRO_PERSON.SSXQDM FROM PREPRO_PERSON " +
             "LEFT JOIN ANALYSIS ON ANALYSIS.FILE_ID = PREPRO_PERSON.FILE_ID " +
             "LEFT JOIN PERSON_POST ON ANALYSIS.FILE_DIC_ID =PERSON_POST.FILE_ID " +
             "WHERE PERSON_POST.FILE_ID=#{fileId}")

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

@@ -17,7 +17,7 @@ public class InfoManagementServiceImpl implements InfoManagementService {
     @Override
     public List<NewFilesEntity> selectInfoManagement(String beginId, String endId, String gajgMc, String beginDate, String endDate,long currPage,long pageSize) {
 
-        List<NewFilesEntity> newFilesEntities = infoManagementMapper.selectInfoManagement(beginId, endId, "%"+gajgMc+"%", beginDate, endDate,currPage * pageSize,(currPage - 1) * pageSize + 1);
+        List<NewFilesEntity> newFilesEntities = infoManagementMapper.selectInfoManagement(beginId, endId, "%"+gajgMc+"%", beginDate, endDate,(currPage - 1) * pageSize + 1,currPage * pageSize);
 
         return newFilesEntities;
     }