feat(qywx): 添加系统角色ID字段以支持用户角色管理
在`qy_user`表中新增`sys_role_id`字段,并在相关DTO、Entity、查询类及服务层中同步更新,以支持用户角色管理功能。同时修复了更新用户角色时未调用`updateById`方法的问题。
This commit is contained in:
parent
ffc5befc81
commit
a26cd2e3c5
|
@ -82,6 +82,7 @@ public class QyUserApplicationService {
|
|||
if (sysUserQyUser != null) {
|
||||
SysUserEntity sysUser = sysUserService.getById(sysUserQyUser.getSysUserId());
|
||||
sysUser.setRoleId(command.getRoleId() > 0 ? command.getRoleId() : null);
|
||||
sysUserService.updateById(sysUser);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -148,6 +148,10 @@ public class QyUserEntity extends BaseEntity<QyUserEntity> {
|
|||
@TableField("balance")
|
||||
private BigDecimal balance;
|
||||
|
||||
@ApiModelProperty("系统角色id")
|
||||
@TableField("sys_role_id")
|
||||
private Long sysRoleId;
|
||||
|
||||
@Override
|
||||
public Serializable pkVal() {
|
||||
return this.id;
|
||||
|
|
|
@ -106,6 +106,9 @@ public class QyUserDTO {
|
|||
@ExcelColumn(name = "用户余额")
|
||||
private BigDecimal balance;
|
||||
|
||||
@ExcelColumn(name = "系统角色ID")
|
||||
private Long sysRoleId;
|
||||
|
||||
@ExcelColumn(name = "角色ID")
|
||||
private Long roleId;
|
||||
|
||||
|
|
|
@ -20,6 +20,7 @@ public class SearchQyUserQuery<T> extends AbstractPageQuery<T> {
|
|||
private String enable;
|
||||
private Date startTime;
|
||||
private Date endTime;
|
||||
private Long sysRoleId;
|
||||
|
||||
@Override
|
||||
public QueryWrapper<T> addQueryCondition() {
|
||||
|
@ -28,6 +29,7 @@ public class SearchQyUserQuery<T> extends AbstractPageQuery<T> {
|
|||
queryWrapper
|
||||
.eq(StrUtil.isNotBlank(corpid), "corpid", corpid)
|
||||
.eq(StrUtil.isNotBlank(userid), "userid", userid)
|
||||
.eq(sysRoleId != null, "sys_role_id", sysRoleId)
|
||||
.like(StrUtil.isNotBlank(name), "name", name)
|
||||
.like(StrUtil.isNotBlank(mobile), "mobile", mobile)
|
||||
.eq(StrUtil.isNotBlank(department), "department", department)
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
ALTER TABLE `shop_goods`
|
||||
ADD COLUMN `usage_instruction` VARCHAR(512) NULL COMMENT '商品使用说明'
|
||||
AFTER `goods_detail`;
|
||||
AFTER `goods_detail`;
|
||||
|
||||
ALTER TABLE `qy_user`
|
||||
ADD COLUMN `sys_role_id` BIGINT DEFAULT NULL COMMENT '系统角色id'
|
||||
AFTER `balance`;
|
Loading…
Reference in New Issue