init
This commit is contained in:
@@ -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.FullUserVo;
|
||||||
import com.ruoyi.xq.dto.admin.user.UserAdminUpdateVo;
|
import com.ruoyi.xq.dto.admin.user.UserAdminUpdateVo;
|
||||||
import com.ruoyi.xq.dto.admin.user.UserAdminVo;
|
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.*;
|
||||||
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.app.common.IdReq;
|
import com.ruoyi.xq.dto.app.common.IdReq;
|
||||||
import com.ruoyi.xq.service.UserInfoService;
|
import com.ruoyi.xq.service.UserInfoService;
|
||||||
import com.ruoyi.xq.service.UserInviteService;
|
import com.ruoyi.xq.service.UserInviteService;
|
||||||
@@ -198,6 +195,17 @@ public class UserController extends BaseController {
|
|||||||
return R.ok();
|
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();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除用户管理
|
* 删除用户管理
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -173,6 +173,8 @@ public class User implements Serializable {
|
|||||||
|
|
||||||
private String openId;
|
private String openId;
|
||||||
|
|
||||||
|
private String tag;
|
||||||
|
|
||||||
private LocalDateTime createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
private LocalDateTime updateTime;
|
private LocalDateTime updateTime;
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
@@ -34,6 +34,8 @@ public class HomeUserListVo {
|
|||||||
private Integer education;
|
private Integer education;
|
||||||
@Schema(description = "职业")
|
@Schema(description = "职业")
|
||||||
private String profession;
|
private String profession;
|
||||||
|
@Schema(description = "标签, 1-火热标签 2-活跃标签")
|
||||||
|
private String tag;
|
||||||
@Schema(description = "是否已经实名")
|
@Schema(description = "是否已经实名")
|
||||||
private Boolean cardNumAuthBool = false;
|
private Boolean cardNumAuthBool = false;
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
</select>
|
</select>
|
||||||
<select id="homePageApp" resultType="com.ruoyi.xq.dto.app.user.vo.HomeUserListVo">
|
<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,
|
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
|
from xq_user t1
|
||||||
join xq_user_auth t2 on t1.id = t2.user_id
|
join xq_user_auth t2 on t1.id = t2.user_id
|
||||||
join xq_user_info t3 on t1.id = t3.user_id
|
join xq_user_info t3 on t1.id = t3.user_id
|
||||||
|
|||||||
Reference in New Issue
Block a user