|
|
@@ -211,15 +211,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
public Pagination<OutPublicReleaseList> listPublicRelease(InputPublicReleaseList in) {
|
|
|
Map<String,Object> map =new HashMap<String, Object>();
|
|
|
map.put("type", in.getType()==null?0:in.getType());
|
|
|
-// if (!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)){
|
|
|
+ if (!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)){
|
|
|
map.put("aid", TokenManager.getAdminId());
|
|
|
-// }
|
|
|
+ }
|
|
|
if (StringUtils.isNotEmpty(in.getClockTime())) map.put("clockTime", in.getClockTime());
|
|
|
if(StringUtils.isNotEmpty(in.getReleaseStarts())) map.put("releaseStarts", in.getReleaseStarts());
|
|
|
if(StringUtils.isNotEmpty(in.getReleaseEnds())) map.put("publicEnd", in.getReleaseEnds()+" 23:59:59");
|
|
|
if(StringUtils.isNotEmpty(in.getUserName())) map.put("userName", in.getUserName());
|
|
|
if(in.getStatus()!=null) map.put("status", in.getStatus());
|
|
|
if(in.getClockIn()!=null) map.put("clockIn", in.getClockIn());
|
|
|
+ if(in.getAssist()!=null)map.put("assist",in.getAssist());
|
|
|
Pagination<OutPublicReleaseList> p=(Pagination<OutPublicReleaseList>) findPage("listPublicRelease", "countPublicRelease", map, in.getPageNo(), in.getPageSize());
|
|
|
return p;
|
|
|
}
|