|
|
@@ -96,7 +96,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
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);
|
|
|
+ boutique,null, hot);
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
}
|
|
|
@@ -117,11 +117,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
@Override
|
|
|
public Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId,
|
|
|
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, String internationalFlag,Integer pNo, Integer pSize,
|
|
|
Integer boutique, Integer hot) {
|
|
|
Map<String, Object> params = disposeParams(unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
|
|
|
releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
|
|
|
- boutique, hot);
|
|
|
+ boutique,internationalFlag, hot);
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
}
|
|
|
@@ -212,14 +212,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
}
|
|
|
return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
|
|
|
disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
|
|
|
- status, releaseDateStartDate, releaseDateEndDate, releaseStatus, null, null, null),
|
|
|
+ status, releaseDateStartDate, releaseDateEndDate, releaseStatus, null, null,null, null),
|
|
|
pNo, pSize);
|
|
|
}
|
|
|
|
|
|
private Map<String, Object> disposeParams(String username, String ownerName, String ownerId, Integer auditStatus,
|
|
|
Integer serialNumber, String name, String keyword, Integer category, Integer status,
|
|
|
String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer type,
|
|
|
- Integer boutique, Integer hot) {
|
|
|
+ Integer boutique,String internationalFlag, Integer hot) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
|
|
|
Date rStart = null;
|
|
|
@@ -296,6 +296,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
if (null != hot) {
|
|
|
params.put("hot", hot);
|
|
|
}
|
|
|
+ if (null != internationalFlag) {
|
|
|
+ params.put("internationalFlag", internationalFlag);
|
|
|
+ }
|
|
|
if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
|
|
|
params.put("techBrokerId", TokenManager.getAdminId());
|
|
|
}
|