From 3ad6b6ba2ba56fc0bcd2130e47190779c6e15acc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 十二月 2023 14:59:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
index bf7ce4a..6272ff1 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
@@ -218,14 +218,20 @@
return res;
case 2:
// 运营商查询运营商账号的员工和属于该运营商门店的员工
- userQuery.setObjectType(2);
- userQuery.setObjectId(objectId);
- // 获取属于这个运营商的门店的店长ids
- List<Integer> storeStaffIds = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId)
- .ne("state", 3)).stream().map(TStore::getStoreStaffId).collect(Collectors.toList());
- userQuery.setStoreIds(storeStaffIds);
+// userQuery.setObjectType(2);
+// userQuery.setObjectId(objectId);
+// // 获取属于这个运营商的门店的店长ids
+// List<Integer> storeStaffIds = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId)
+// .ne("state", 3)).stream().map(TStore::getStoreStaffId).collect(Collectors.toList());
+// userQuery.setStoreIds(storeStaffIds);
+// List<UserListVO> res1= userService.searchUsers(userQuery);
List<UserListVO> res1= userService.searchUsers(userQuery);
- return res1;
+ List<UserListVO> filteredList = res1.stream()
+ .filter(vo -> Objects.equals(vo.getVersion(), UserExt.getUser().getId()))
+ .collect(Collectors.toList());
+
+// return res1;
+ return filteredList;
case 3:
// 门店只查询门店员工
TStore store = storeService.getById(objectId);
@@ -282,7 +288,13 @@
user.setStatus(ManagerStatus.OK.getCode());
user.setCreatetime(new Date());
User objectUser = UserFactory.createUser(user);
- objectUser.setObjectType(Integer.valueOf(user.getRoleid()));
+
+ if (user.getRoleid().equals("")){
+ objectUser.setObjectType(2);
+ }else {
+ objectUser.setObjectType(Integer.valueOf(user.getRoleid()));
+
+ }
objectUser.setObjectId(UserExt.getUser().getObjectId());
objectUser.setRoleid(user.getRoleid());
objectUser.setAccount(user.getPhone());
@@ -307,6 +319,7 @@
objectUser.setRoleid("3");
objectUser.setObjectId(UserExt.getUser().getObjectId());
}
+ objectUser.setVersion(UserExt.getUser().getId());
this.userService.save(objectUser);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1