Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-11-15 8f777d784ee51a7e6ad99e16072c86fea0d39ae3

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

@@ -195,7 +195,7 @@
        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",keyword,null);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null,"1");

        int num=IUserService.selectNum("3",keyword,null);
        return getDataTable(list,num);
@@ -246,7 +246,7 @@
                config.setUserId(user.getUserId());
                config.setCreateBy(user.getUserId()+"");
                config.setUserType("3");

                config.setIsDivisionHead("1");
                config.setUpdateTime(LocalDateTime.now());
                return toAjax(IUserService.updateConfig(config));
            }
@@ -264,7 +264,7 @@
                config.setUserId(user2.getUserId());
                config.setCreateBy(user2.getUserId()+"");
                config.setUserType("3");

                config.setIsDivisionHead("1");
                config.setUpdateTime(LocalDateTime.now());
                return toAjax(IUserService.updateConfig(config));
            }
@@ -278,6 +278,7 @@
        config.setCreateBy(sysUser.getUserId()+"");
        config.setUserId(Snowflake.getId()+"");
        config.setUserType("3");
        config.setIsDivisionHead("1");

        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());