lidongdong
2022-10-21 4f43125773ea3f37bc19f92915c0a00d755712cf
flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -103,6 +103,9 @@
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());
            map.put("permission", user.getPermission());
            map.put("userType", user.getUserType());
            map.put("departmentId", user.getDepartmentId());
            map.put("departmentName", user.getDepartmentName());
            return ResultData.success(map);
        }
@@ -129,6 +132,9 @@
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());
            map.put("permission", user.getPermission());
            map.put("userType", user.getUserType());
            map.put("departmentId", user.getDepartmentId());
            map.put("departmentName", user.getDepartmentName());
            return ResultData.success(map);
        }
@@ -170,14 +176,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 +230,7 @@
        config.setCreateBy(sysUser.getUserId()+"");
        config.setUserId(Snowflake.getId());
        config.setUserId(Snowflake.getId()+"");
        config.setUserType("3");
        config.setCreateTime(LocalDateTime.now());
@@ -332,8 +339,6 @@
        {
            return error("输入密码与原密码不能相同!");
        }
        return toAjax(IUserService.updateConfig(config));
    }