Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

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

@@ -43,14 +43,14 @@
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "name",required = false) String name)
                                          @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,"2",name);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword);

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

@@ -98,8 +98,18 @@
        SysUser user=IUserService.selectData(null,config.getPhonenumber());
        if (user != null)
        {
            user.setPassword(config.getPassword());
            user.setDepartmentId(config.getDepartmentId());
            user.setUserName(config.getUserName());
            user.setPhonenumber(config.getPhonenumber());
            user.setLoginName(config.getLoginName());
            user.setMasterIds(config.getMasterIds());
            user.setRoleIds(2+"");
            user.setUserType("2");
            user.setStatus(config.getStatus());
            user.setUpdateTime(LocalDateTime.now());
            //提示用户名或密码错误
            return ResultData.error("该手机号已注册账户！请更换");
            return toAjax(IUserService.updateConfig(user));
        }
        config.setRoleIds(2+"");
        config.setCreateTime(LocalDateTime.now());
@@ -209,8 +219,7 @@
    @ApiOperation(" 查询导办用户列表（不分页）")
    @GetMapping("/queryList")
    @Authorization
    public  ResultData  queryList(){
        return  ResultData.success(IUserService.queryList(2));
    public  ResultData  queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
        return  ResultData.success(IUserService.queryList(2,keyWord));
    }

}