Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-21 12c8caec0265ffff1c595bcab71b66201d3fbd21

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -170,14 +170,15 @@
    @GetMapping("/getlist")
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize)
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "keyword",required = false) String keyword)
    {
        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,"3");
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword);

        int num=IUserService.selectNum("3");
        int num=IUserService.selectNum("3",keyword);
        return getDataTable(list,num);
    }

@@ -223,7 +224,7 @@


        config.setCreateBy(sysUser.getUserId()+"");
        config.setUserId(Snowflake.getId());
        config.setUserId(Snowflake.getId()+"");
        config.setUserType("3");

        config.setCreateTime(LocalDateTime.now());
@@ -241,11 +242,11 @@
    @ApiOperation("修改用户接口")
    @PostMapping("/update")
    @Authorization
    public ResultData updateConfig(@RequestBody SysUser config)
    public ResultData updateConfig(@RequestBody SysUser config,@CurrentUser SysUser sys)
    {
        if(config.getUserId()==null)
        if(config.getId()==null)
        {
            return error("userId不能为空");
            return error("Id不能为空");
        }

        if(StringUtils.isEmpty(config.getLoginName()))
@@ -255,6 +256,8 @@

        config.setUserType("3");

        config.setUpdateBy(sys.getUserId()+"");

        return toAjax(IUserService.updateConfig(config));
    }