From 86cdd920b68274185233383f69ddb974052b6b6f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 01 四月 2024 17:55:51 +0800
Subject: [PATCH] system模块修改
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/DataScopeManagerController.java | 107 ++++++++++++++++-------------------------------------
1 files changed, 33 insertions(+), 74 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/DataScopeManagerController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/DataScopeManagerController.java
index 85a9357..74f33d5 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/DataScopeManagerController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/DataScopeManagerController.java
@@ -1,23 +1,17 @@
package com.qianwen.smartman.modules.system.controller;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.lang.invoke.SerializedLambda;
-import java.util.List;
-import java.util.Map;
-import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.DictCache;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.ExtCacheConstant;
-import com.qianwen.smartman.common.enums.DictEnum;
import com.qianwen.core.boot.ctrl.BladeController;
import com.qianwen.core.cache.utils.CacheUtil;
import com.qianwen.core.log.annotation.ApiLog;
@@ -31,14 +25,21 @@
import com.qianwen.core.tool.api.R;
import com.qianwen.core.tool.support.Kv;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.cache.DictCache;
+import com.qianwen.smartman.common.cache.RegionCache;
+import com.qianwen.smartman.common.constant.ExtCacheConstant;
+import com.qianwen.smartman.common.enums.DictEnum;
import com.qianwen.smartman.modules.system.entity.Dept;
import com.qianwen.smartman.modules.system.service.IDataScopeManagerService;
import com.qianwen.smartman.modules.system.vo.DataScopeGrantVO;
import com.qianwen.smartman.modules.system.vo.DeptVO;
import com.qianwen.smartman.modules.system.wrapper.DeptWrapper;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import springfox.documentation.annotations.ApiIgnore;
@Api(value = "鏁版嵁鏉冮檺", tags = {"鏁版嵁鏉冮檺"})
@@ -49,59 +50,6 @@
public class DataScopeManagerController extends BladeController {
private final IDataScopeManagerService dataScopeManagerService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -75145708:
- if (implMethodName.equals("getSort")) {
- z = false;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 771206363:
- if (implMethodName.equals("getTenantId")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getSort();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getSort();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/Dept") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTenantId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public DataScopeManagerController(final IDataScopeManagerService dataScopeManagerService) {
this.dataScopeManagerService = dataScopeManagerService;
@@ -122,6 +70,15 @@
@GetResource({"/list"})
@ApiOperation(value = "鍒楄〃", notes = "浼犲叆dept")
public R<List<DeptVO>> list(@RequestParam @ApiIgnore Map<String, Object> dept, BladeUser bladeUser) {
+ QueryWrapper<Dept> queryWrapper = Condition.getQueryWrapper(dept, Dept.class);
+
+ if (!bladeUser.getTenantId().equals("000000")) {
+ queryWrapper.lambda().eq(Dept::getTenantId, bladeUser.getTenantId()).orderByAsc(Dept::getSort);
+ } else {
+ queryWrapper.lambda().orderByAsc(Dept::getSort);
+ }
+
+ /*
Wrapper wrapper;
QueryWrapper<Dept> queryWrapper = Condition.getQueryWrapper(dept, Dept.class);
IDataScopeManagerService iDataScopeManagerService = this.dataScopeManagerService;
@@ -135,8 +92,8 @@
wrapper = (Wrapper) queryWrapper.lambda().orderByAsc((v0) -> {
return v0.getSort();
});
- }
- List<Dept> list = iDataScopeManagerService.list(wrapper);
+ }*/
+ List<Dept> list = dataScopeManagerService.list(queryWrapper);
return R.data(DeptWrapper.build().listNodeVO(list));
}
@@ -195,9 +152,11 @@
@ApiOperation(value = "涓嬫媺鏁版嵁婧�", notes = "浼犲叆id闆嗗悎")
@PreAuth("permitAll()")
public R<List<Dept>> select(String deptId) {
+ List<Dept> list = this.dataScopeManagerService.list(Wrappers.<Dept>lambdaQuery().in(Dept::getId, Func.toLongList(deptId)));
+ /*
List<Dept> list = this.dataScopeManagerService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
- }, Func.toLongList(deptId)));
+ }, Func.toLongList(deptId)));*/
return R.data(list);
}
--
Gitblit v1.9.3