|
|
@@ -10,10 +10,10 @@ import com.goafanti.common.dao.RoleMapper;
|
|
|
import com.goafanti.common.dao.RolePermissionMapper;
|
|
|
import com.goafanti.common.dao.UserMapper;
|
|
|
import com.goafanti.common.dao.UserRoleMapper;
|
|
|
-import com.goafanti.common.model.Role;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
+import com.goafanti.permission.bo.RoleBo;
|
|
|
import com.goafanti.permission.service.NewRoleService;
|
|
|
@Service
|
|
|
public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements NewRoleService {
|
|
|
@@ -26,13 +26,13 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
|
|
|
@Autowired
|
|
|
RolePermissionMapper rolePermissionMapper;
|
|
|
@Override
|
|
|
- public Pagination<Role> findRoles(Role role, Integer pageNo, Integer pageSize) {
|
|
|
+ public Pagination<RoleBo> findRoles(RoleBo role, Integer pageNo, Integer pageSize) {
|
|
|
Map<String,Object> params =disposeParams(role);
|
|
|
@SuppressWarnings("unchecked")
|
|
|
- Pagination<Role> p=(Pagination<Role>)findPage("selectRoleList","selectRoleCount",params,pageNo,pageSize);
|
|
|
+ Pagination<RoleBo> p=(Pagination<RoleBo>)findPage("selectRoleList","selectRoleCount",params,pageNo,pageSize);
|
|
|
return p;
|
|
|
}
|
|
|
- private Map<String,Object> disposeParams(Role role){
|
|
|
+ private Map<String,Object> disposeParams(RoleBo role){
|
|
|
Map<String,Object> params = new HashMap<String, Object>();
|
|
|
if(StringUtils.isNotBlank(role.getRoleName())) params.put("roleName", role.getRoleName());
|
|
|
return params;
|