Procházet zdrojové kódy

Merge remote-tracking branch 'origin/master' into test

ender před 8 roky
rodič
revize
264d5d038f

+ 6 - 7
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -94,6 +94,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,
 			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,
 			Integer boutique, Integer hot) {
 			Integer boutique, Integer hot) {
+		Map<String, Object> params = disposeParams(username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
+				releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
+				boutique, hot,TokenManager.getAdminId());
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 			pNo = 1;
 		}
 		}
@@ -101,11 +104,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (pSize == null || pSize < 0 || pSize > 10) {
 		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 			pSize = 10;
 		}
 		}
+		
 		return (Pagination<AchievementListBo>) findPage("findUserOwnerAchievementListByPage",
 		return (Pagination<AchievementListBo>) findPage("findUserOwnerAchievementListByPage",
-				"findUserOwnerAchievementCount",
-				disposeParams(username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
-						releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.PERSONAL.getCode(), boutique,
-						hot,TokenManager.getAdminId()),
+				"findUserOwnerAchievementCount",params,
 				pNo, pSize);
 				pNo, pSize);
 	}
 	}
 
 
@@ -130,9 +131,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		}
 		}
 		
 		
 		return (Pagination<AchievementListBo>) findPage("findOrgOwnerAchievementListByPage",
 		return (Pagination<AchievementListBo>) findPage("findOrgOwnerAchievementListByPage",
-				"findOrgOwnerAchievementCount",params
-				,
-				pNo, pSize);
+				"findOrgOwnerAchievementCount",params,pNo, pSize);
 	}
 	}
 
 
 	@Override
 	@Override