diff --git a/src/main/java/com/example/demo/domain/vo/Permission.java b/src/main/java/com/example/demo/domain/vo/Permission.java index 4a2705d..bf38802 100644 --- a/src/main/java/com/example/demo/domain/vo/Permission.java +++ b/src/main/java/com/example/demo/domain/vo/Permission.java @@ -28,4 +28,5 @@ public class Permission { private String remark; //备注 private Integer adminStatus; //状态 private Integer roleId; //角色id + private List markets; //市场 列表 } diff --git a/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java index cc6a2b4..f5e592d 100644 --- a/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java @@ -10,6 +10,7 @@ import com.example.demo.domain.vo.Result; import com.example.demo.mapper.AdminMapper; import com.example.demo.mapper.PermissionMapper; import com.example.demo.service.AdminService; +import com.example.demo.service.GeneralService; import com.example.demo.service.PermissionService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -40,6 +41,8 @@ public class PermissionServiceImpl implements PermissionService { private AdminMapper adminMapper; @Autowired private AdminService adminService; + @Autowired + private GeneralService generalService; @Override public List getposition(String token) { @@ -53,6 +56,9 @@ public class PermissionServiceImpl implements PermissionService { @Override public PageInfo getpermission(Integer pageNum, Integer pageSize, Permission permission) { + String account = adminService.getCurrentAdminAccount(); + List markets = generalService.getAdminMarket(account); + permission.setMarkets(markets); PageHelper.startPage(pageNum, pageSize); List list = permissionMapper.getPermission(permission); for (Permission item : list) { diff --git a/src/main/resources/mapper/PermissionMapper.xml b/src/main/resources/mapper/PermissionMapper.xml index 71d0eb7..8e6376d 100644 --- a/src/main/resources/mapper/PermissionMapper.xml +++ b/src/main/resources/mapper/PermissionMapper.xml @@ -75,6 +75,13 @@ from admin LEFT JOIN role on admin.role_id=role.id + + AND ( + + admin.market LIKE CONCAT('%', #{market}, '%') + + ) + and admin.account=#{account}