|
|
@@ -10,6 +10,7 @@ import com.fdkankan.manage_jp.mapper.IManageFolderMapper;
|
|
|
import com.fdkankan.manage_jp.service.*;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fdkankan.manage_jp.vo.request.ManageFolderSceneVo;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -80,9 +81,12 @@ public class ManageFolderServiceImpl extends ServiceImpl<IManageFolderMapper, Ma
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public List<ManageFolder> tree(User user,Integer type) {
|
|
|
+ public List<ManageFolder> tree(User user,Integer type,String folderName) {
|
|
|
LambdaQueryWrapper<ManageFolder> wrapper = new LambdaQueryWrapper<>();
|
|
|
wrapper.eq(ManageFolder::getType, type);
|
|
|
+ if(StringUtils.isNotBlank(folderName)){
|
|
|
+ wrapper.like(ManageFolder::getName,folderName);
|
|
|
+ }
|
|
|
Boolean platfromAdmin = userRoleService.isPlatfromAdmin(user);
|
|
|
if(!platfromAdmin){ //超级管理员
|
|
|
if(user.getCompanyId() != null){
|