|
@ -10,6 +10,7 @@ import com.example.demo.domain.vo.Result; |
|
|
import com.example.demo.mapper.AdminMapper; |
|
|
import com.example.demo.mapper.AdminMapper; |
|
|
import com.example.demo.mapper.PermissionMapper; |
|
|
import com.example.demo.mapper.PermissionMapper; |
|
|
import com.example.demo.service.AdminService; |
|
|
import com.example.demo.service.AdminService; |
|
|
|
|
|
import com.example.demo.service.GeneralService; |
|
|
import com.example.demo.service.PermissionService; |
|
|
import com.example.demo.service.PermissionService; |
|
|
import com.github.pagehelper.PageHelper; |
|
|
import com.github.pagehelper.PageHelper; |
|
|
import com.github.pagehelper.PageInfo; |
|
|
import com.github.pagehelper.PageInfo; |
|
@ -40,6 +41,8 @@ public class PermissionServiceImpl implements PermissionService { |
|
|
private AdminMapper adminMapper; |
|
|
private AdminMapper adminMapper; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private AdminService adminService; |
|
|
private AdminService adminService; |
|
|
|
|
|
@Autowired |
|
|
|
|
|
private GeneralService generalService; |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public List<String> getposition(String token) { |
|
|
public List<String> getposition(String token) { |
|
@ -53,6 +56,9 @@ public class PermissionServiceImpl implements PermissionService { |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public PageInfo<Permission> getpermission(Integer pageNum, Integer pageSize, Permission permission) { |
|
|
public PageInfo<Permission> getpermission(Integer pageNum, Integer pageSize, Permission permission) { |
|
|
|
|
|
String account = adminService.getCurrentAdminAccount(); |
|
|
|
|
|
List<String> markets = generalService.getAdminMarket(account); |
|
|
|
|
|
permission.setMarkets(markets); |
|
|
PageHelper.startPage(pageNum, pageSize); |
|
|
PageHelper.startPage(pageNum, pageSize); |
|
|
List<Permission> list = permissionMapper.getPermission(permission); |
|
|
List<Permission> list = permissionMapper.getPermission(permission); |
|
|
for (Permission item : list) { |
|
|
for (Permission item : list) { |
|
|