From 8f992e29ea429cd5c35eea7a376c565bfed7fc8d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 20:19:33 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index b654b8c..e534ee6 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -520,6 +520,10 @@
@ApiOperation(value = "用户列表-更换绑定人", tags = {"管理后台"})
public R<AppUser> select(Long id, Long inviteId) {
AppUser byId = appUserService.getById(id);
+ Long userId = byId.getId();
+ if (userId.equals(inviteId)) {
+ return R.fail("不能选择自己为绑定人。");
+ }
byId.setInviteUserId(inviteId);
byId.setTopInviteId(getTop(inviteId));
appUserService.updateById(byId);
@@ -639,8 +643,8 @@
}
- @GetMapping("/listByIds")
- List<AppUser> listByIds(@RequestParam("ids") List<Long> ids) {
+ @PostMapping("/listByIds")
+ public List<AppUser> listByIds(@RequestParam("ids") List<Long> ids) {
if(ids.size() == 0){
return new ArrayList<>();
}
@@ -660,7 +664,7 @@
/**
* 设置指定用户的下级用户绑定门店
*/
- @PutMapping("setLowerUserShop")
+ @PostMapping("/setLowerUserShop")
public R<Void> setLowerUserShop(@RequestParam("userId") Long userId,@RequestParam("shopId") Integer shopId) {
appUserService.update(new LambdaUpdateWrapper<AppUser>()
.set(AppUser::getShopId,shopId)
@@ -723,8 +727,7 @@
*/
@GetMapping("/commissionDetail")
@ApiOperation(value = "分佣统计", tags = "管理后台-首页统计")
- public R<CommissionDetail> commissionDetail(@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime,
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) {
+ public R<CommissionDetail> commissionDetail(CommissionDetail commissionDetail) {
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
LambdaQueryWrapper<AppUser> queryWrapper = new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0);
--
Gitblit v1.7.1