明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2024-08-22 1e4b4f686f4462786c75b9a9f2cd59f29d8b2140 
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java


@@ -1,12 +1,9 @@


package com.ruoyi.system.controller;




import java.io.IOException;


import java.util.*;


import java.util.stream.Collectors;


import javax.annotation.Resource;


import javax.servlet.http.HttpServletResponse;




import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import com.ruoyi.chargingPile.api.feignClient.SiteClient;


@@ -17,31 +14,19 @@


import com.ruoyi.other.api.feignClient.RoleSiteClient;


import com.ruoyi.other.api.feignClient.UserSiteClient;


import com.ruoyi.system.api.query.ChangeUserQuery;


import com.ruoyi.system.domain.dto.IndexDto;


import com.ruoyi.system.domain.vo.UserRoleVO;


import com.ruoyi.system.api.model.*;


import com.ruoyi.system.domain.SysUserRole;


import com.ruoyi.system.domain.dto.AddCompanyUserDto;


import com.ruoyi.system.domain.vo.CompanyUserVo;


import com.ruoyi.system.domain.vo.TCompanyToUserVo;


import com.ruoyi.system.query.GetSysUserList;


import com.ruoyi.system.query.ShopUserStart;


import com.ruoyi.system.service.*;


import io.seata.spring.annotation.GlobalTransactional;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiImplicitParam;


import io.swagger.annotations.ApiImplicitParams;


import io.swagger.annotations.ApiOperation;


import org.apache.commons.lang3.ArrayUtils;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.transaction.annotation.Propagation;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.CollectionUtils;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.multipart.MultipartFile;


import com.ruoyi.common.core.domain.R;


import com.ruoyi.common.core.utils.poi.ExcelUtil;


import com.ruoyi.common.core.web.controller.BaseController;


import com.ruoyi.common.core.web.domain.AjaxResult;


import com.ruoyi.common.log.annotation.Log;


@@ -292,17 +277,17 @@




    @PostMapping("/shopUserStart")


    @ApiOperation(value = "账号管理--禁用/启用", tags = {"管理后台-系统用户管理"})


    public AjaxResult shopUserStart(@RequestParam("userId") Long userId, @RequestParam("remark") String remark) {


        if (userId == null) {


    public AjaxResult shopUserStart(@RequestBody ShopUserStart shopUserStart) {


        if (shopUserStart.getUserId() == null) {


            return AjaxResult.error("userId不能为空");


        }


        SysUser sysUser = userService.selectUserById(userId);


        SysUser sysUser = userService.selectUserById(shopUserStart.getUserId());


        if (sysUser.getStatus().equals("0")) {


            sysUser.setStatus("1");


            sysUser.setRemark(remark);


            sysUser.setForbiddenRemark(shopUserStart.getRemark());


        } else {


            sysUser.setStatus("0");


            sysUser.setRemark("");


            sysUser.setForbiddenRemark("");


        }


        return toAjax(userService.updateUser(sysUser));


    }