1.酷比森用户信息菜单详情角色显示bug修改

2.酷比森用户信息菜单列表部门显示bug修改
3.人员信息导出接口增加权限区分
4.经销商-人员信息列表显示需要显示经销商自己账号信息

blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RoleVO.java

@@ -54,4 +54,14 @@ public class RoleVO extends Role implements INode<RoleVO> {
 	 * 上级角色
 	 */
 	private String parentName;
+
+	/**
+	 * 上级角色
+	 */
+	private String title;
+
+	/**
+	 * 上级角色
+	 */
+	private Long value;
 }

blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml

@@ -96,7 +96,10 @@
         FROM
         blade_dept dept
         WHERE
-        dept.parent_id = #{param2} AND dept.is_deleted = 0
+        dept.is_deleted = 0
+        <if test="param2!=null and param2!=''">
+            AND dept.parent_id = #{param2}
+        </if>
         <if test="param1!=null and param1!=''">
             and dept.tenant_id = #{param1}
         </if>

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -101,14 +101,14 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		if (AuthUtil.isAdministrator()) {
 			tenantId = StringPool.EMPTY;
 		}
-		List<DeptVO> tree = null;
+		List<DeptVO> tree;
 		if (!AuthUtil.getUserRole().contains("admin")) {
 			R<User> r = userClient.userInfoById(AuthUtil.getUserId());
 			if (r.isSuccess()) {
-				tree = baseMapper.lazyTree(tenantId, parentId, Long.parseLong(r.getData().getDeptPid().split(",")[0]));
+				tree = baseMapper.lazyTree(tenantId, null, Long.parseLong(r.getData().getDeptId().split(",")[0]));
 			} else {
 				if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
-					tree = baseMapper.lazyTree(tenantId, parentId, Long.parseLong(AuthUtil.getDeptId().split(",")[0]));
+					tree = baseMapper.lazyTree(tenantId, null, Long.parseLong(AuthUtil.getDeptId().split(",")[0]));
 				} else {
 					tree = new ArrayList<>();
 				}

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java

@@ -11,10 +11,8 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.node.ForestNodeMerger;
-import org.springblade.core.tool.utils.CollectionUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.core.tool.node.TreeNode;
+import org.springblade.core.tool.utils.*;
 import org.springblade.system.entity.Role;
 import org.springblade.system.entity.RoleMenu;
 import org.springblade.system.entity.RoleScope;
@@ -60,11 +58,37 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
 	@Override
 	public List<RoleVO> tree(String tenantId) {
 		if (AuthUtil.getUserRole().contains("dealer")) {
-			Role role = baseMapper.selectOne(new LambdaQueryWrapper<Role>()
+			List<RoleVO> list = new ArrayList<>();
+			Role dealerRole = baseMapper.selectOne(new LambdaQueryWrapper<Role>()
 				.eq(Role::getTenantId,tenantId)
 				.eq(Role::getIsDeleted,0)
 				.eq(Role::getRoleAlias,"dealer"));
-			return ForestNodeMerger.merge(baseMapper.treeDealer(tenantId, role.getId()));
+			List<RoleVO> roleVOList = baseMapper.treeDealer(tenantId, dealerRole.getId());
+			RoleVO dealerRoleVO = new RoleVO();
+			dealerRoleVO.setId(dealerRole.getId());
+			dealerRoleVO.setRoleName(dealerRole.getRoleName());
+			dealerRoleVO.setParentId(dealerRole.getParentId());
+			dealerRoleVO.setRoleAlias(dealerRole.getRoleAlias());
+			dealerRoleVO.setSort(dealerRole.getSort());
+			dealerRoleVO.setChildren(roleVOList);
+			dealerRoleVO.setValue(dealerRole.getId());
+			dealerRoleVO.setTitle(dealerRole.getRoleName());
+			list.add(dealerRoleVO);
+			Role storeRole = baseMapper.selectOne(new LambdaQueryWrapper<Role>()
+				.eq(Role::getTenantId,tenantId)
+				.eq(Role::getIsDeleted,0)
+				.eq(Role::getRoleAlias,"store"));
+			RoleVO storeRoleVO = new RoleVO();
+			storeRoleVO.setId(storeRole.getId());
+			storeRoleVO.setRoleName(storeRole.getRoleName());
+			storeRoleVO.setParentId(storeRole.getParentId());
+			storeRoleVO.setRoleAlias(storeRole.getRoleAlias());
+			storeRoleVO.setSort(storeRole.getSort());
+			storeRoleVO.setChildren(new ArrayList<>());
+			storeRoleVO.setValue(storeRole.getId());
+			storeRoleVO.setTitle(storeRole.getRoleName());
+			list.add(storeRoleVO);
+			return ForestNodeMerger.merge(list);
 		}else{
 			String userRole = AuthUtil.getUserRole();
 			String excludeRole = null;

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java

@@ -47,7 +47,7 @@ public interface UserMapper extends BaseMapper<User> {
 	 * @return
 	 */
 //	List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
-	List<UserExcel> exportUser(String tenantId);
+	List<UserExcel> exportUser(@Param("tenantId")String tenantId,@Param("deptIdList") List<Long> deptIdList);
 
 	/**
 	 * 根据租户获取用户信息

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -154,12 +154,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 			deptId = Long.parseLong(AuthUtil.getDeptId().split(",")[0]);
 		}
 		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
-		R<String> res = sysClient.getRoleIds(AuthUtil.getTenantId(), user.getRoleId());
+		/*R<String> res = sysClient.getRoleIds(AuthUtil.getTenantId(), user.getRoleId());
 		String roleId = "";
 		if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 			roleId = res.getData();
-		}
-		return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId, roleId));
+		}*/
+		return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId, null));
 	}
 
 	@Override
@@ -355,8 +355,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 
 	@Override
 	public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
+		Long deptId = null;
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			deptId = Long.parseLong(AuthUtil.getDeptId().split(",")[0]);
+		}
+		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
 		List<UserExcel> userList = new ArrayList<>();
-		userList = baseMapper.exportUser(AuthUtil.getTenantId());
+		userList = baseMapper.exportUser(AuthUtil.getTenantId(),deptIdList);
 		userList.forEach(user -> {
 			user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
 			user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));