|
@@ -932,10 +932,10 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
if (StringUtils.isBlank(dto.getSortFiled())) {
|
|
|
criA.getOrderBy().orderBy("createTime", dto.getSortType());
|
|
|
} else {
|
|
|
- if(dto.getSortFiled().equals("ipRoleCountFilter")){
|
|
|
+ if (dto.getSortFiled().equals("ipRoleCountFilter")) {
|
|
|
dto.setSortFiled("roleUserIpCount");
|
|
|
}
|
|
|
- if(dto.getSortFiled().equals("roleUserIpCountFilter")){
|
|
|
+ if (dto.getSortFiled().equals("roleUserIpCountFilter")) {
|
|
|
dto.setSortFiled("roleUserIpCountFilter");
|
|
|
}
|
|
|
criA.getOrderBy().orderBy(dto.getSortFiled(), dto.getSortType());
|
|
@@ -1647,6 +1647,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
b.gs_id as gsId,
|
|
|
b.customer_service_id as customerServiceId,
|
|
|
b.oper_user_id as operUserId,
|
|
|
+ b.remark as remark,
|
|
|
c.pitcher_id as pitcherId,
|
|
|
d.ip,
|
|
|
d.ip_count as ipCount,
|