|
|
|
@ -2,6 +2,7 @@ package jnpf.permission.service.impl;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.text.StrPool;
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
|
|
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
@ -40,6 +41,7 @@ import jnpf.permission.service.*;
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
@ -716,7 +718,9 @@ public class AuthorizeServiceImpl extends SuperServiceImpl<AuthorizeMapper, Auth
|
|
|
|
|
add(userInfo.getOrganizeId());
|
|
|
|
|
}});
|
|
|
|
|
if(CollectionUtils.isNotEmpty(orgAllPathList)){
|
|
|
|
|
itemValue = String.join(",", orgAllPathList.get(0));
|
|
|
|
|
itemValue = JSON.toJSONString(orgAllPathList.get(0));
|
|
|
|
|
itemValue = itemValue.substring(1);
|
|
|
|
|
itemValue = itemValue.substring(0, itemValue.length() -1);//去掉[]
|
|
|
|
|
}else{
|
|
|
|
|
itemValue = "";
|
|
|
|
|
}
|
|
|
|
@ -790,6 +794,7 @@ public class AuthorizeServiceImpl extends SuperServiceImpl<AuthorizeMapper, Auth
|
|
|
|
|
* @param allIdList 组织id列表。
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@NotNull
|
|
|
|
|
private List<List<String>> getOrgAllPathList(List<String> allIdList) {
|
|
|
|
|
List<List<String>> resOrg=new ArrayList<>();
|
|
|
|
|
for(String itemOrg: allIdList){
|
|
|
|
|