java/mx_charging_pile.git

			@@ -9,6 +9,7 @@
			import com.ruoyi.chargingPile.service.IPartnerService;
			import com.ruoyi.chargingPile.service.TParkingLotService;
			import com.ruoyi.common.core.web.page.PageInfo;
			import com.ruoyi.common.security.service.TokenService;
			import com.ruoyi.common.security.utils.SecurityUtils;
			import com.ruoyi.other.api.feignClient.RoleSiteClient;
			import com.ruoyi.other.api.feignClient.UserSiteClient;
			@@ -35,7 +36,8 @@
			public class TParkingLotServiceImpl extends ServiceImpl<TParkingLotMapper, TParkingLot> implements TParkingLotService {
			@Resource
			private SysUserClient sysUserClient;

			@Resource
			private TokenService tokenService;
			@Resource
			private IPartnerService partnerService;

			@@ -55,7 +57,7 @@

			Set<Integer> siteIds = null;
			//校验合作商权限
			SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
			SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
			Integer roleType = sysUser.getRoleType();
			Integer objectId = sysUser.getObjectId();
			//合作商
			@@ -63,7 +65,7 @@
			siteIds = partnerService.authSite(objectId, SiteMenu.PARKING_LOT);
			}else{
			//非管理员需要根据角色和用户配置查询允许的站点数据
			if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
			if(!SecurityUtils.isAdmin(tokenService.getLoginUser().getUserid())){
			List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
			List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
			List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
			@@ -89,7 +91,7 @@
			public List<TParkingLotVO> getList(String name) {
			Set<Integer> siteIds = null;
			//校验合作商权限
			SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
			SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
			Integer roleType = sysUser.getRoleType();
			Integer objectId = sysUser.getObjectId();
			//合作商
			@@ -97,7 +99,7 @@
			siteIds = partnerService.authSite(objectId, SiteMenu.PARKING_LOT);
			}else{
			//非管理员需要根据角色和用户配置查询允许的站点数据
			if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
			if(!SecurityUtils.isAdmin(tokenService.getLoginUser().getUserid())){
			List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
			List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
			List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();