update 权限

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -149,6 +149,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
 	@Override
 	@DataScope(deptAlias = "t3")
 	public List<OrderListVO> selectOrderBasicInfoList(QueryOrderDTO dto) {
+		// 权限过滤
+
 		List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto);
 		if (CollectionUtils.isNotEmpty(orderListVOS)) {
 			for (OrderListVO orderListVO : orderListVOS) {

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java

@@ -5,9 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.jsowell.common.constant.Constants;
 import com.jsowell.common.core.domain.entity.SysDept;
-import com.jsowell.common.core.domain.entity.SysRole;
-import com.jsowell.common.core.domain.entity.SysUser;
-import com.jsowell.common.core.domain.model.LoginUser;
+import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
 import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.DistanceUtils;
@@ -26,7 +24,6 @@ import com.jsowell.pile.vo.base.ConnectorInfoVO;
 import com.jsowell.pile.vo.base.MerchantInfoVO;
 import com.jsowell.pile.vo.base.StationInfoVO;
 import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails;
-import com.jsowell.pile.vo.web.AuthorizedDeptVO;
 import com.jsowell.pile.vo.web.PileStationVO;
 import com.jsowell.system.service.SysDeptService;
 import lombok.extern.slf4j.Slf4j;
@@ -128,45 +125,6 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 		return pileStationInfoMapper.selectPileStationInfoList(pileStationInfo);
 	}
 
-	// 查询登录用户权限id
-	private AuthorizedDeptVO getAuthorizedMap() {
-		// 登录用户
-		LoginUser loginUser = SecurityUtils.getLoginUser();
-		if (loginUser == null) {
-			return null;
-		}
-		// 用户
-		SysUser user = loginUser.getUser();
-		if (user == null) {
-			return null;
-		}
-		AuthorizedDeptVO resultVO = AuthorizedDeptVO.builder().build();
-		// 登录用户所属部门（运营商或站点 根据父级id判断）
-		SysDept dept = user.getDept();
-		if (dept == null) {
-			return null;
-		}
-		// 登录用户角色
-		List<SysRole> roles = user.getRoles();
-		log.info("登录用户deptIds", roles.get(0).getDeptIds());
-		Long parentId = dept.getParentId();
-		List<String> merchantDeptIds = Lists.newArrayList();
-		List<String> stationDeptIds = Lists.newArrayList();
-		if (parentId == 0L) {
-			// 父级id是0，表明是该账号挂在平台下面，是系统管理员
-
-		} else if (parentId == 100L) {
-			// 父级id是100，表明是该账号挂在运营商下面，是运营商管理员
-			merchantDeptIds.add(String.valueOf(dept.getDeptId()));
-			resultVO.setMerchantDeptIds(merchantDeptIds);
-		} else {
-			// 其他情况，表明是站点管理员
-			stationDeptIds.add(String.valueOf(dept.getDeptId()));
-			resultVO.setStationDeptIds(stationDeptIds);
-		}
-		return resultVO;
-	}
-
 	/**
 	 * 通过运营商id查询站点信息
 	 *
@@ -271,7 +229,7 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 	@Override
 	// @DataScope(deptAlias = "t3")
 	public List<PileStationVO> queryStationInfos(QueryStationDTO dto) {
-		AuthorizedDeptVO authorizedMap = getAuthorizedMap();
+		AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
 		if (authorizedMap == null) {
 			// 为空表示没有权限，返回空数组
 			return Lists.newArrayList();

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/AuthorizedDeptVO.java

@@ -1,19 +0,0 @@
-package com.jsowell.pile.vo.web;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class AuthorizedDeptVO {
-	// 有权限的运营商
-	private List<String> merchantDeptIds;
-	// 有权限的站点
-	private List<String> stationDeptIds;
-}