diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/QyUserApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/QyUserApplicationService.java index 3d0bdcb..e7edcbd 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/QyUserApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/QyUserApplicationService.java @@ -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); } } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/db/QyUserEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/db/QyUserEntity.java index 7ecdfe8..0359600 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/db/QyUserEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/db/QyUserEntity.java @@ -148,6 +148,10 @@ public class QyUserEntity extends BaseEntity { @TableField("balance") private BigDecimal balance; + @ApiModelProperty("系统角色id") + @TableField("sys_role_id") + private Long sysRoleId; + @Override public Serializable pkVal() { return this.id; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/dto/QyUserDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/dto/QyUserDTO.java index c23d129..47ccbac 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/dto/QyUserDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/dto/QyUserDTO.java @@ -106,6 +106,9 @@ public class QyUserDTO { @ExcelColumn(name = "用户余额") private BigDecimal balance; + @ExcelColumn(name = "系统角色ID") + private Long sysRoleId; + @ExcelColumn(name = "角色ID") private Long roleId; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/query/SearchQyUserQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/query/SearchQyUserQuery.java index e37d78b..d6cac70 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/query/SearchQyUserQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/query/SearchQyUserQuery.java @@ -20,6 +20,7 @@ public class SearchQyUserQuery extends AbstractPageQuery { private String enable; private Date startTime; private Date endTime; + private Long sysRoleId; @Override public QueryWrapper addQueryCondition() { @@ -28,6 +29,7 @@ public class SearchQyUserQuery extends AbstractPageQuery { 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) diff --git a/sql/20250520_goods.sql b/sql/20250520_goods.sql index 8f64bab..fe75a20 100644 --- a/sql/20250520_goods.sql +++ b/sql/20250520_goods.sql @@ -1,3 +1,7 @@ ALTER TABLE `shop_goods` ADD COLUMN `usage_instruction` VARCHAR(512) NULL COMMENT '商品使用说明' -AFTER `goods_detail`; \ No newline at end of file +AFTER `goods_detail`; + +ALTER TABLE `qy_user` +ADD COLUMN `sys_role_id` BIGINT DEFAULT NULL COMMENT '系统角色id' +AFTER `balance`; \ No newline at end of file