|
|
@@ -169,11 +169,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
|
|
|
Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
|
|
|
Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo,
|
|
|
- Integer pSize, Integer boutique, Integer hot, String techBrokerId) {
|
|
|
+ Integer pSize, Integer boutique, Integer hot, String techBrokerId,String recordPerson) {
|
|
|
Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
|
|
|
demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
|
|
|
releaseDateStartDate, releaseDateEndDate, createDateStartDate, createDateEndDate, boutique, hot);
|
|
|
-
|
|
|
+
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
}
|
|
|
@@ -196,6 +196,9 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (null != dataCategory) {
|
|
|
params.put("dataCategory", dataCategory);
|
|
|
}
|
|
|
+ if (null!=recordPerson) {
|
|
|
+ params.put("recordPerson", recordPerson);
|
|
|
+ }
|
|
|
|
|
|
/*if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
|
|
|
params.put("adminId", TokenManager.getAdminId());
|
|
|
@@ -1058,7 +1061,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
|
|
|
Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
|
|
|
Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo,
|
|
|
- Integer pSize, Integer boutique, Integer hot, String techBrokerId) {
|
|
|
+ Integer pSize, Integer boutique, Integer hot, String techBrokerId,String recordPerson) {
|
|
|
Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
|
|
|
demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
|
|
|
releaseDateStartDate, releaseDateEndDate, createDateStartDate, createDateEndDate, boutique, hot);
|
|
|
@@ -1072,8 +1075,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
}
|
|
|
if (null != dataCategory) {
|
|
|
params.put("dataCategory", dataCategory);
|
|
|
+ }
|
|
|
+ if (null != recordPerson) {
|
|
|
+ params.put("recordPerson", recordPerson);
|
|
|
}
|
|
|
-
|
|
|
if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
|
|
|
params.put("adminId", TokenManager.getAdminId());
|
|
|
}
|