system模块修改

yangys

2024-04-01 86cdd920b68274185233383f69ddb974052b6b6f

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/UserController.java

@@ -1,22 +1,21 @@
package com.qianwen.smartman.modules.system.controller;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.ArrayList;
import java.util.List;
import java.util.Map;

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.smartman.common.cache.UserCache;
import com.qianwen.smartman.common.constant.ExtCacheConstant;

import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.qianwen.core.cache.utils.CacheUtil;
import com.qianwen.core.excel.util.ExcelUtil;
import com.qianwen.core.log.annotation.ApiLog;
@@ -32,6 +31,9 @@
import com.qianwen.core.tenant.annotation.NonDS;
import com.qianwen.core.tool.api.R;
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.smartman.common.cache.UserCache;
import com.qianwen.smartman.common.constant.ExtCacheConstant;
import com.qianwen.smartman.modules.system.convert.UserConvert;
import com.qianwen.smartman.modules.system.dto.PasswordModifyValidInfo;
import com.qianwen.smartman.modules.system.entity.User;
@@ -48,11 +50,12 @@
import com.qianwen.smartman.modules.system.vo.UserSimpleVO;
import com.qianwen.smartman.modules.system.vo.UserVO;
import com.qianwen.smartman.modules.system.wrapper.UserWrapper;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

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 = {"用户"})
@@ -65,51 +68,6 @@
    private final InitPasswordModifyLink initPasswordModifyLink;
    private final AccountPasswordModifyLink accountPasswordModifyLink;

    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
        String implMethodName = lambda.getImplMethodName();
        boolean z = true;
        switch (implMethodName.hashCode()) {
            case 771206363:
                if (implMethodName.equals("getTenantId")) {
                    z = true;
                    break;
                }
                break;
            case 961079513:
                if (implMethodName.equals("getIsDeleted")) {
                    z = false;
                    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/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
                    return (v0) -> {
                        return v0.getIsDeleted();
                    };
                }
                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/core/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
                    return (v0) -> {
                        return v0.getTenantId();
                    };
                }
                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/core/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
                    return (v0) -> {
                        return v0.getTenantId();
                    };
                }
                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/core/tenant/mp/TenantEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
                    return (v0) -> {
                        return v0.getTenantId();
                    };
                }
                break;
        }
        throw new IllegalArgumentException("Invalid lambda deserialization");
    }

    public UserController(final IUserService userService, final InitPasswordModifyLink initPasswordModifyLink, final AccountPasswordModifyLink accountPasswordModifyLink) {
        this.userService = userService;
@@ -139,10 +97,14 @@
    @GetResource({"/list"})
    @ApiOperation(value = "列表", notes = "传入account和realName")
    public R<IPage<UserVO>> list(@RequestParam @ApiIgnore Map<String, Object> user, Query query, BladeUser bladeUser) {
        Wrapper queryWrapper = Condition.getQueryWrapper(user, User.class);
    	
       QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
        IPage<User> pages = this.userService.page(Condition.getPage(query), !bladeUser.getTenantId().equals("000000") ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper);
        /*
        
        IPage<User> pages = this.userService.page(Condition.getPage(query), !bladeUser.getTenantId().equals("000000") ? (Wrapper) queryWrapper.lambda().eq((v0) -> {
            return v0.getTenantId();
        }, bladeUser.getTenantId()) : queryWrapper);
        }, bladeUser.getTenantId()) : queryWrapper);*/
        return R.data(UserWrapper.build().pageVO(pages));
    }

@@ -230,10 +192,13 @@
    @GetResource({"/user-list"})
    @ApiOperation(value = "用户列表", notes = "传入user")
    public R<List<User>> userList(User user, BladeUser bladeUser) {
       QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user);
        List<User> list = this.userService.list(!AuthUtil.isAdministrator() ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper);
       /*
        Wrapper queryWrapper = Condition.getQueryWrapper(user);
        List<User> list = this.userService.list(!AuthUtil.isAdministrator() ? (Wrapper) queryWrapper.lambda().eq((v0) -> {
            return v0.getTenantId();
        }, bladeUser.getTenantId()) : queryWrapper);
        }, bladeUser.getTenantId()) : queryWrapper);*/
        return R.data(list);
    }

@@ -252,15 +217,21 @@
    @GetResource({"export-user"})
    @ApiOperation(value = "导出用户", notes = "传入user")
    public void exportUser(@RequestParam @ApiIgnore Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
        Wrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
        //Wrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
        QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
        if (!AuthUtil.isAdministrator()) {
           queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()); 
           /*
            queryWrapper.lambda().eq((v0) -> {
                return v0.getTenantId();
            }, bladeUser.getTenantId());
            }, bladeUser.getTenantId());*/
        }
        
        queryWrapper.lambda().eq(User::getIsDeleted, 0);
        /*
        queryWrapper.lambda().eq((v0) -> {
            return v0.getIsDeleted();
        }, 0);
        }, 0);*/
        List<UserExcel> list = this.userService.exportUser(queryWrapper);
        ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
    }