|
@@ -17,6 +17,7 @@
|
|
|
package org.springblade.modules.system.controller;
|
|
package org.springblade.modules.system.controller;
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -26,6 +27,7 @@ import org.springblade.core.boot.ctrl.BladeController;
|
|
|
import org.springblade.core.launch.constant.AppConstant;
|
|
import org.springblade.core.launch.constant.AppConstant;
|
|
|
import org.springblade.core.mp.support.Condition;
|
|
import org.springblade.core.mp.support.Condition;
|
|
|
import org.springblade.core.mp.support.Query;
|
|
import org.springblade.core.mp.support.Query;
|
|
|
|
|
+import org.springblade.core.secure.BladeUser;
|
|
|
import org.springblade.core.tool.api.R;
|
|
import org.springblade.core.tool.api.R;
|
|
|
import org.springblade.core.tool.utils.Func;
|
|
import org.springblade.core.tool.utils.Func;
|
|
|
import org.springblade.modules.system.entity.Post;
|
|
import org.springblade.modules.system.entity.Post;
|
|
@@ -131,8 +133,8 @@ public class PostController extends BladeController {
|
|
|
@GetMapping("/select")
|
|
@GetMapping("/select")
|
|
|
@ApiOperationSupport(order = 8)
|
|
@ApiOperationSupport(order = 8)
|
|
|
@ApiOperation(value = "下拉数据源", notes = "传入post")
|
|
@ApiOperation(value = "下拉数据源", notes = "传入post")
|
|
|
- public R<List<Post>> select(Post post) {
|
|
|
|
|
- List<Post> list = postService.list(Condition.getQueryWrapper(post));
|
|
|
|
|
|
|
+ public R<List<Post>> select(String tenantId, BladeUser bladeUser) {
|
|
|
|
|
+ List<Post> list = postService.list(Wrappers.<Post>query().lambda().eq(Post::getTenantId, Func.toStrWithEmpty(tenantId, bladeUser.getTenantId())));
|
|
|
return R.data(list);
|
|
return R.data(list);
|
|
|
}
|
|
}
|
|
|
|
|
|