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

张天森

2022-10-18 bcadd92fe4db2024058b36a82d8b9b5f6e5f247d

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

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

@@ -4,6 +4,7 @@
import com.dg.core.HttpStatus;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.HuaChengSysUser;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.manager.TokenManager;
@@ -190,7 +191,7 @@
    @ApiOperation("新增用户接口")
    @PostMapping("/add")
    @Authorization
    public ResultData insertConfig(@RequestBody SysUser config)
    public ResultData insertConfig(@RequestBody SysUser config, @CurrentUser SysUser sysUser)
    {
        Assert.notNull(config, "parameter can not be empty");

@@ -220,6 +221,8 @@
            return error("该账户已存在！");
        }


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

@@ -238,7 +241,7 @@
    @ApiOperation("修改用户接口")
    @PostMapping("/update")
    @Authorization
    public ResultData updateConfig(@RequestBody SysUser config)
    public ResultData updateConfig(@RequestBody SysUser config,@CurrentUser SysUser sys)
    {
        if(config.getUserId()==null)
        {
@@ -251,6 +254,8 @@
        }

        config.setUserType("3");

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

        return toAjax(IUserService.updateConfig(config));
    }
@@ -328,6 +333,8 @@
            return error("输入密码与原密码不能相同！");
        }



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


 flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java

@@ -253,5 +253,10 @@
    private String roleName;


    @TableField(exist = false)
    @ApiModelProperty("创建人名称")
    private String createName;



}

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -72,6 +72,7 @@
            transaction_ids,
            transaction_names,
            openid,
            (select user_name from automessage_sys_user where automessage_sys_user.user_id=create_by) as createName,
            transaction_num,
            (select role_name from automessage_role_management where automessage_role_management.id=role_ids) as roleName,
            (select permission from automessage_role_management where automessage_role_management.id=role_ids) as permission,