lidongdong
2022-10-18 29fcb54693e8730251382d1446872bc0d7e8a964
flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -9,6 +9,7 @@
import com.dg.core.manager.TokenManager;
import com.dg.core.service.IHuaChengSysUserService;
import com.dg.core.util.SmsUtil;
import com.dg.core.util.Snowflake;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -62,7 +63,7 @@
            }
            //本地表查询用户
            user = IUserService.selectData(huaChengSysUser.getUserId()+"");
            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
            if (user == null) {
                //本地没有此用户  新用户
                SysUser newSysUser=new SysUser();
@@ -79,7 +80,7 @@
                IUserService.insertConfig(newSysUser);
            }
            user = IUserService.selectData(huaChengSysUser.getUserId()+"");
            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
            if (user == null) {
                return ResultData.error("用户不存在!请联系管理员");
@@ -100,6 +101,7 @@
            map.put("token", token);
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());
            map.put("permission", user.getPermission());
            return ResultData.success(map);
        }
@@ -125,6 +127,7 @@
            map.put("token", token);
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());
            map.put("permission", user.getPermission());
            return ResultData.success(map);
        }
@@ -171,9 +174,9 @@
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"1");
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3");
        int num=IUserService.selectNum("1");
        int num=IUserService.selectNum("3");
        return getDataTable(list,num);
    }
@@ -206,13 +209,19 @@
            return error("昵称不能为空");
        }
        SysUser user = IUserService.getUserByAccount(config.getLoginName());
        if(StringUtils.isEmpty(config.getPhonenumber()))
        {
            return error("手机号不能为空");
        }
        SysUser user = IUserService.selectData("",config.getPhonenumber());
        if (user != null) {
            //提示用户名或密码错误
            return error("该账户已存在!");
        }
        config.setUserType("1");
        config.setUserId(Snowflake.getId());
        config.setUserType("3");
        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());
@@ -241,7 +250,7 @@
            return error("账户不能为空");
        }
        config.setUserType("1");
        config.setUserType("3");
        return toAjax(IUserService.updateConfig(config));
    }
@@ -280,7 +289,7 @@
            return error("userId不能为空");
        }
        SysUser sysUser=IUserService.selectData(userId);
        SysUser sysUser=IUserService.selectData(userId,null);
        //删除标志(0代表存在 2代表删除)
        sysUser.setDelFlag("2");
        return toAjax(IUserService.updateConfig(sysUser));
@@ -308,7 +317,7 @@
            return error("密码不能为空");
        }
        SysUser sysUser=IUserService.selectData(config.getUserId()+"");
        SysUser sysUser=IUserService.selectData(config.getUserId()+"",null);
        if(sysUser==null)
        {
            return error("用户不存在");