This commit is contained in:
张良(004796)
2024-05-09 14:54:59 +08:00
parent 7344d66640
commit 7d8b86c8f6
5 changed files with 28 additions and 5 deletions

View File

@@ -18,10 +18,7 @@ import com.ruoyi.xq.domain.UserInfo;
import com.ruoyi.xq.dto.admin.user.FullUserVo;
import com.ruoyi.xq.dto.admin.user.UserAdminUpdateVo;
import com.ruoyi.xq.dto.admin.user.UserAdminVo;
import com.ruoyi.xq.dto.admin.user.req.AddUserReq;
import com.ruoyi.xq.dto.admin.user.req.ResetPasswordAdminReq;
import com.ruoyi.xq.dto.admin.user.req.UpdateMobileAdminReq;
import com.ruoyi.xq.dto.admin.user.req.UpdateUserReq;
import com.ruoyi.xq.dto.admin.user.req.*;
import com.ruoyi.xq.dto.app.common.IdReq;
import com.ruoyi.xq.service.UserInfoService;
import com.ruoyi.xq.service.UserInviteService;
@@ -198,6 +195,17 @@ public class UserController extends BaseController {
return R.ok();
}
@SaCheckPermission("xq:user:edit")
@Log(title = "修改用户标签", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> editTag(@RequestBody UpdateUserTagReq bo) {
userService.update(Wrappers.lambdaUpdate(User.class)
.in(User::getId, bo.getUserIds())
.set(User::getTag, bo.getTag()));
return R.ok();
}
/**
* 删除用户管理
*

View File

@@ -173,6 +173,8 @@ public class User implements Serializable {
private String openId;
private String tag;
private LocalDateTime createTime;
private LocalDateTime updateTime;

View File

@@ -0,0 +1,11 @@
package com.ruoyi.xq.dto.admin.user.req;
import lombok.Data;
import java.util.List;
@Data
public class UpdateUserTagReq {
private Integer tag;
private List<Long> userIds;
}

View File

@@ -34,6 +34,8 @@ public class HomeUserListVo {
private Integer education;
@Schema(description = "职业")
private String profession;
@Schema(description = "标签, 1-火热标签 2-活跃标签")
private String tag;
@Schema(description = "是否已经实名")
private Boolean cardNumAuthBool = false;

View File

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="homePageApp" resultType="com.ruoyi.xq.dto.app.user.vo.HomeUserListVo">
select t1.id as user_id, t1.avatar, t1.gender, t1.nickname, t1.birthday,t1.age, t1.residence_city_name,t1.open_vip,t1.vip_type,
t1.education, t1.profession, if(t2.card_num_auth = 2, 1, 0) as card_num_auth_bool,t4.show_avatar
t1.education, t1.profession, if(t2.card_num_auth = 2, 1, 0) as card_num_auth_bool,t4.show_avatar,t1.tag
from xq_user t1
join xq_user_auth t2 on t1.id = t2.user_id
join xq_user_info t3 on t1.id = t3.user_id