This commit is contained in:
wangjinlei
2023-12-27 16:52:20 +08:00
parent f1fb1938ef
commit 79efe0b151

View File

@@ -80,7 +80,6 @@ public class MyUserController {
wrapper.and(p.getKey()!="",k->k.like(MyUserEntity::getName,p.getKey()).or().like(MyUserEntity::getTel,p.getKey())); wrapper.and(p.getKey()!="",k->k.like(MyUserEntity::getName,p.getKey()).or().like(MyUserEntity::getTel,p.getKey()));
wrapper.orderByDesc(MyUserEntity::getCreateTime); wrapper.orderByDesc(MyUserEntity::getCreateTime);
Page<MyUserEntity> myUserEntityPage = userService.getBaseMapper().selectPage(new Page<MyUserEntity>(p.getPage(), p.getLimit()), wrapper); Page<MyUserEntity> myUserEntityPage = userService.getBaseMapper().selectPage(new Page<MyUserEntity>(p.getPage(), p.getLimit()), wrapper);
return R.ok().put("user",myUserEntityPage); return R.ok().put("user",myUserEntityPage);
} }
@@ -93,7 +92,6 @@ public class MyUserController {
return null; return null;
} }
/** /**
* 信息 * 信息
*/ */
@@ -101,10 +99,6 @@ public class MyUserController {
// @RequiresPermissions("book:user:info") // @RequiresPermissions("book:user:info")
public R info(@PathVariable("id") Integer id){ public R info(@PathVariable("id") Integer id){
MyUserEntity user = userService.getById(id); MyUserEntity user = userService.getById(id);
// List<CouponHistoryEntity> list = couponHistoryService.getBaseMapper().selectList(new QueryWrapper<CouponHistoryEntity>().eq("member_id", id)
// .eq("use_status", 0));
// user.setConponsCount(list.size());
return R.ok().put("user", user); return R.ok().put("user", user);
} }
@@ -117,7 +111,6 @@ public class MyUserController {
String saltMD5 = MD5Utils.getSaltMD5(password); String saltMD5 = MD5Utils.getSaltMD5(password);
user.setPassword(saltMD5); user.setPassword(saltMD5);
userService.save(user); userService.save(user);
return R.ok(); return R.ok();
} }
@@ -164,15 +157,12 @@ public class MyUserController {
} }
/** /**
* 删除 * 删除
*/ */
@RequestMapping("/delete") @RequestMapping("/delete")
// @RequiresPermissions("book:user:delete")
public R delete(@RequestBody Integer[] ids){ public R delete(@RequestBody Integer[] ids){
userService.removeByIds(Arrays.asList(ids)); userService.removeByIds(Arrays.asList(ids));
return R.ok(); return R.ok();
} }