lyhzzz před 2 měsíci
rodič
revize
fdc5b6be65

+ 3 - 2
src/main/java/com/fdkankan/manage_jp/controller/ManageFolderController.java

@@ -53,8 +53,9 @@ public class ManageFolderController extends BaseController{
     }
 
     @GetMapping("/tree")
-    public Result tree(@RequestParam (required = false)Integer type){
-        return Result.success(manageFolderService.tree(getUser(),type));
+    public Result tree(@RequestParam (required = false)Integer type,
+                       @RequestParam (required = false)String folderName ){
+        return Result.success(manageFolderService.tree(getUser(),type,folderName));
     }
 
     @PostMapping("/moveScene")

+ 1 - 1
src/main/java/com/fdkankan/manage_jp/service/IManageFolderService.java

@@ -21,7 +21,7 @@ public interface IManageFolderService extends IService<ManageFolder> {
 
     List<ManageFolder> getSonList(Integer folderId);
 
-    List<ManageFolder>  tree(User user,Integer tyep);
+    List<ManageFolder>  tree(User user,Integer tyep,String folderName);
 
     void moveScene(ManageFolderSceneVo param);
 

+ 5 - 1
src/main/java/com/fdkankan/manage_jp/service/impl/ManageFolderServiceImpl.java

@@ -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){