|
@@ -82,8 +82,12 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
|
|
|
param.put("RdEnd", in.getRdEnd());
|
|
param.put("RdEnd", in.getRdEnd());
|
|
|
param.put("RdName", in.getRdName());
|
|
param.put("RdName", in.getRdName());
|
|
|
param.put("consultantName", in.getConsultantName());
|
|
param.put("consultantName", in.getConsultantName());
|
|
|
|
|
+ param.put("userName", in.getUserName());
|
|
|
|
|
+ if (in.getStartTime()!=null&&in.getEndTime()!=null){
|
|
|
|
|
+ param.put("startTime",in.getStartTime());
|
|
|
|
|
+ param.put("endTime",in.getEndTime()+" 23:59:59");
|
|
|
|
|
+ }
|
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)||TokenManager.hasRole(AFTConstants.CED)){
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)||TokenManager.hasRole(AFTConstants.CED)){
|
|
|
-
|
|
|
|
|
}else {
|
|
}else {
|
|
|
param.put("aid", TokenManager.getAdminId());
|
|
param.put("aid", TokenManager.getAdminId());
|
|
|
}
|
|
}
|