修改支付宝支付和bug修改

无关风月

3 天以前 df4733091b30b0434a04dacd0e844663114d4cfe

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RoleServiceImpl.java

@@ -1,7 +1,9 @@
package com.dsh.guns.modular.system.service.impl;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import javax.annotation.Resource;

@@ -9,7 +11,10 @@
import com.dsh.course.mapper.RelationMapper;
import com.dsh.course.mapper.RoleMapper;
import com.dsh.course.model.node.ZTreeNode;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.modular.system.controller.util.Convert;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.service.IStoreService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -54,22 +59,35 @@

    @Override
    public List<Map<String, Object>> selectRoles(String condition) {
        return this.baseMapper.selectRoles(condition);
        Integer objectType = UserExt.getUser().getObjectType();
        Integer objectId = UserExt.getUser().getObjectId();
        return this.baseMapper.selectRoles(condition,objectType,objectId);
    }

    @Override
    public int deleteRolesById(Integer roleId) {
        return this.baseMapper.deleteRolesById(roleId);
    }

    @Resource
    private IStoreService storeService;
    @Override
    public List<ZTreeNode> roleTreeList() {
        return this.baseMapper.roleTreeList();
    public List<ZTreeNode> roleTreeList(Integer type,Integer id) {
        List<Integer> storeIds = new ArrayList<>();
        if (type==2){
            // 查询运营商下的门店ids
            List<Integer> collect = storeService.lambdaQuery().eq(TStore::getOperatorId, id).list()
                    .stream().map(TStore::getId).collect(Collectors.toList());
            if (collect.isEmpty()){
                storeIds.add(-1);
            }
            storeIds.addAll(collect);
        }
        return this.baseMapper.roleTreeList(type,id,storeIds);
    }

    @Override
    public List<ZTreeNode> roleTreeListByRoleId(String[] roleId) {
        return this.baseMapper.roleTreeListByRoleId(roleId);
    public List<ZTreeNode> roleTreeListByRoleId(String[] roleId,Integer type,Integer id) {
        return this.baseMapper.roleTreeListByRoleId(roleId,type,id);
    }

}