|
@@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil;
|
|
|
import com.dragoninfo.dcuc.auth.sub.dto.AuthOrgDTO;
|
|
|
import com.dragoninfo.dcuc.auth.sub.dto.OrgTreeNodeDTO;
|
|
|
import com.dragoninfo.dcuc.auth.sub.facade.IAuthOrgInfoFacade;
|
|
|
-import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
|
|
|
import com.dragoninfo.dcuc.authweb.business.MtAuthBusiness;
|
|
|
import com.dragoninfo.dcuc.authweb.common.SysConstants;
|
|
|
import com.dragoninfo.dcuc.authweb.restcontroller.org.vo.OrgRangeVo;
|
|
@@ -31,7 +30,6 @@ import org.springframework.data.domain.PageImpl;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
-import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -166,7 +164,7 @@ public class AuthOrgInfoController {
|
|
|
})
|
|
|
@PostMapping(value = "org/tree/match")
|
|
|
public Result orgMatch(@RequestBody TreeReqVo reqVo) {
|
|
|
- String mtType = reqVo.getType();
|
|
|
+ String mtType = reqVo.getMtType();
|
|
|
String name = reqVo.getName();
|
|
|
Integer pageNum = reqVo.getPageNum();
|
|
|
Integer pageSize = reqVo.getPageSize();
|
|
@@ -250,7 +248,7 @@ public class AuthOrgInfoController {
|
|
|
if (StringUtils.isNotEmpty(mtAuthIds)) {
|
|
|
childList = childList
|
|
|
.stream()
|
|
|
- .filter(e-> !OrgInfoUtil.isHaveAuth(e.getId(), e.getPath(), mtAuthIds))
|
|
|
+ .filter(e-> OrgInfoUtil.isHaveAuth(e.getId(), e.getPath(), mtAuthIds))
|
|
|
.collect(Collectors.toList());
|
|
|
}
|
|
|
return childList.stream().map(e->{
|