autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "update"

Browse Source 
This reverts commit 71be841f4d65a63a61059bb45bbc6e6f4bb35b42.
This commit is contained in:
Guoqs
2024-05-28 11:54:57 +08:00
parent cc777bd9fb
commit 61e40908b2
5 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java
View File

@@ -108,9 +108,9 @@ public class MemberBasicInfoController extends BaseController {
@GetMapping("/getMerchantListByAuth")
public RestApiResponse<?> getMerchantListByAuth() {
RestApiResponse<?> response = null;
// LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
// logger.info("获取登录用户信息:{}", JSON.toJSONString(loginUserDetail));
List<MerchantInfoVO> list = UserUtils.getMerchantInfoVOList();
LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
logger.info("获取登录用户信息:{}", JSON.toJSONString(loginUserDetail));
List<MerchantInfoVO> list = loginUserDetail.getMerchantInfoVOList();
if (CollectionUtils.isEmpty(list)) {
list = new ArrayList<>();
}

6
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java
View File

@@ -41,9 +41,9 @@ public class MemberGroupController extends BaseController {
@PreAuthorize("@ss.hasPermi('member:memberGroup:list')")
@GetMapping("/list")
public TableDataInfo list(MemberGroupDTO memberGroup) {
// LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
// logger.info("获取登录用户信息:{}", JSON.toJSONString(loginUserDetail));
List<MerchantInfoVO> merchantInfoVOList = UserUtils.getMerchantInfoVOList();
LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
logger.info("获取登录用户信息:{}", JSON.toJSONString(loginUserDetail));
List<MerchantInfoVO> merchantInfoVOList = loginUserDetail.getMerchantInfoVOList();
List<String> collect = merchantInfoVOList.stream().map(MerchantInfoVO::getMerchantId).collect(Collectors.toList());
memberGroup.setMerchantIdList(collect);
startPage();