Commit dedc0dcc by xushihong

搜索显示下标更新

parent 571fde93
...@@ -10,6 +10,7 @@ import com.xzxtshiro.service.SysPermissionNewService; ...@@ -10,6 +10,7 @@ import com.xzxtshiro.service.SysPermissionNewService;
import com.xzxtshiro.util.SequenceUtil; import com.xzxtshiro.util.SequenceUtil;
import com.xzxtshiro.util.TokenUtil; import com.xzxtshiro.util.TokenUtil;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import org.omg.CORBA.PERSIST_STORE;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -70,7 +71,11 @@ public class SysPermissionNewServiceImpl implements SysPermissionNewService { ...@@ -70,7 +71,11 @@ public class SysPermissionNewServiceImpl implements SysPermissionNewService {
List<SysPermissionNew> permissions = permissionNewDao.selectSysPermissionNewByCondition(permission); List<SysPermissionNew> permissions = permissionNewDao.selectSysPermissionNewByCondition(permission);
Integer count = permissionNewDao.selectSysPermissionNewCountByCondition(permission); Integer count = permissionNewDao.selectSysPermissionNewCountByCondition(permission);
BaseModel permissionPage = new BaseModel(); BaseModel permissionPage = new BaseModel();
if(permission.getName() != null || permission.getPid() != null || permission.getId() != null){
permissionPage.setCount(permissions.size());
}else{
permissionPage.setCount(count); permissionPage.setCount(count);
}
permissionPage.setData(permissions); permissionPage.setData(permissions);
return permissionPage; return permissionPage;
} }
......
...@@ -46,6 +46,9 @@ public class SysRoleServiceImpl implements SysRoleService{ ...@@ -46,6 +46,9 @@ public class SysRoleServiceImpl implements SysRoleService{
Integer count = sysRoleDao.selectSysRoleCountByCondition(SysRole); Integer count = sysRoleDao.selectSysRoleCountByCondition(SysRole);
Integer testDataSize = data.size();
System.out.println(testDataSize);
//过滤permissmionName查询 //过滤permissmionName查询
if(SysRole.getPermissionName() != null){ if(SysRole.getPermissionName() != null){
for(int i = 0; i < count; i ++){ for(int i = 0; i < count; i ++){
...@@ -63,14 +66,22 @@ public class SysRoleServiceImpl implements SysRoleService{ ...@@ -63,14 +66,22 @@ public class SysRoleServiceImpl implements SysRoleService{
if(role.getPermissionName().indexOf(SysRole.getPermissionName()) != -1){ if(role.getPermissionName().indexOf(SysRole.getPermissionName()) != -1){
}else{ }else{
data.remove(role); data.remove(role);
count --;
i --;
break; break;
} }
} }
} }
count --;
} }
BaseModel rolePage = new BaseModel(); BaseModel rolePage = new BaseModel();
if(SysRole.getRolename() != null){
rolePage.setCount(data.size());
}else{
rolePage.setCount(count); rolePage.setCount(count);
}
rolePage.setData(data); rolePage.setData(data);
return rolePage; return rolePage;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment