|
|
@@ -37,14 +37,17 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
|
|
|
RolePermissionMapper rolePermissionMapper;
|
|
|
@Override
|
|
|
public Pagination<RoleBo> findRoles(RoleBo role, Integer pageNo, Integer pageSize) {
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
Map<String,Object> params =disposeParams(role);
|
|
|
@SuppressWarnings("unchecked")
|
|
|
Pagination<RoleBo> p=(Pagination<RoleBo>)findPage("selectRoleList","selectRoleCount",params,pageNo,pageSize);
|
|
|
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
|
|
|
@SuppressWarnings("unchecked")
|
|
|
- List<RoleBo> list=(List<RoleBo>)p.getList();
|
|
|
+ List<RoleBo> list=(List<RoleBo>) p.getList();
|
|
|
for(RoleBo i:list){
|
|
|
- i.setCreateTimez(sdf.format(i.getCreateTime()));
|
|
|
+ if(i.getCreateTime()!=null){
|
|
|
+ i.setCreateTimez(sdf.format(i.getCreateTime()));
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
return p;
|
|
|
}
|