|
@@ -50,6 +50,8 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
if(p.getDepartmentId()!=null)params.put("departmentId", p.getDepartmentId());
|
|
if(p.getDepartmentId()!=null)params.put("departmentId", p.getDepartmentId());
|
|
|
if(p.getStartDate()!=null)params.put("startDate", p.getStartDate());
|
|
if(p.getStartDate()!=null)params.put("startDate", p.getStartDate());
|
|
|
if(p.getEndDate()!=null)params.put("endDate", p.getEndDate());
|
|
if(p.getEndDate()!=null)params.put("endDate", p.getEndDate());
|
|
|
|
|
+ if(p.getCreateStart()!=null)params.put("createStart", p.getCreateStart());
|
|
|
|
|
+ if(p.getCreateEnd()!=null)params.put("createEnd", p.getCreateEnd()+" 23:59:59");
|
|
|
if(p.getType()!=null)params.put("type", p.getType());
|
|
if(p.getType()!=null)params.put("type", p.getType());
|
|
|
params.put("aid", TokenManager.getAdminId());
|
|
params.put("aid", TokenManager.getAdminId());
|
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.PATENT_AUDITOR)) {
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.PATENT_AUDITOR)) {
|