diff --git a/src/main/java/com/sqx/modules/pay/controller/CashController.java b/src/main/java/com/sqx/modules/pay/controller/CashController.java index b27cc231..e4f302b9 100644 --- a/src/main/java/com/sqx/modules/pay/controller/CashController.java +++ b/src/main/java/com/sqx/modules/pay/controller/CashController.java @@ -480,8 +480,8 @@ public class CashController { @Login @GetMapping(value = "/withdraw") @ApiOperation("发起提现 余额 金钱") - public Result withdraw(Long userId, Double amount) { - return cashOutService.withdraw(userId, amount, true); + public Result withdraw(Long userId, Double money) { + return cashOutService.withdraw(userId, money, true); } diff --git a/src/main/java/com/sqx/modules/sys/entity/SysUserEntity.java b/src/main/java/com/sqx/modules/sys/entity/SysUserEntity.java index 14bb3c3e..e2a0cf40 100644 --- a/src/main/java/com/sqx/modules/sys/entity/SysUserEntity.java +++ b/src/main/java/com/sqx/modules/sys/entity/SysUserEntity.java @@ -1,5 +1,6 @@ package com.sqx.modules.sys.entity; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -22,7 +23,7 @@ import java.util.List; @TableName("sys_user") public class SysUserEntity implements Serializable { private static final long serialVersionUID = 1L; - + /** * 用户ID */ @@ -39,6 +40,7 @@ public class SysUserEntity implements Serializable { * 密码 */ @NotBlank(message="密码不能为空", groups = AddGroup.class) + @TableField(updateStrategy = FieldStrategy.IGNORED) private String password; /** diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysUserRoleServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysUserRoleServiceImpl.java index 786102ac..3945616b 100644 --- a/src/main/java/com/sqx/modules/sys/service/impl/SysUserRoleServiceImpl.java +++ b/src/main/java/com/sqx/modules/sys/service/impl/SysUserRoleServiceImpl.java @@ -10,40 +10,39 @@ import org.springframework.stereotype.Service; import java.util.List; - /** * 用户与角色对应关系 - * + * @author GYJ */ @Service("sysUserRoleService") public class SysUserRoleServiceImpl extends ServiceImpl implements SysUserRoleService { - @Override - public void saveOrUpdate(Long userId, List roleIdList) { - //先删除用户与角色关系 - this.removeByMap(new MapUtils().put("user_id", userId)); + @Override + public void saveOrUpdate(Long userId, List roleIdList) { + if (roleIdList == null || roleIdList.isEmpty()) { + return; + } - if(roleIdList == null || roleIdList.size() == 0){ - return ; - } + //先删除用户与角色关系 + this.removeByMap(new MapUtils().put("user_id", userId)); - //保存用户与角色关系 - for(Long roleId : roleIdList){ - SysUserRoleEntity sysUserRoleEntity = new SysUserRoleEntity(); - sysUserRoleEntity.setUserId(userId); - sysUserRoleEntity.setRoleId(roleId); + //保存用户与角色关系 + for (Long roleId : roleIdList) { + SysUserRoleEntity sysUserRoleEntity = new SysUserRoleEntity(); + sysUserRoleEntity.setUserId(userId); + sysUserRoleEntity.setRoleId(roleId); - this.save(sysUserRoleEntity); - } - } + this.save(sysUserRoleEntity); + } + } - @Override - public List queryRoleIdList(Long userId) { - return baseMapper.queryRoleIdList(userId); - } + @Override + public List queryRoleIdList(Long userId) { + return baseMapper.queryRoleIdList(userId); + } - @Override - public int deleteBatch(Long[] roleIds){ - return baseMapper.deleteBatch(roleIds); - } + @Override + public int deleteBatch(Long[] roleIds) { + return baseMapper.deleteBatch(roleIds); + } }