From 5700f42a37a2f9ecc27161e2b0559a820d320f6b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 17 三月 2025 15:11:40 +0800
Subject: [PATCH] 开发完成同一个手机号登录不同物业公司的支持
---
service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java
index c690a2f..801a39c 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java
@@ -114,6 +114,19 @@
if (ListUtil.isNull(storeUserDtos)) {
throw new CmdException("淇敼鍛樺伐涓嶆槸璐靛叕鍙稿憳宸�");
}
+
+ UserDto userDto = new UserDto();
+ userDto.setTel(reqJson.getString("tel"));
+ userDto.setUserFlag("1");
+ userDto.setLevelCd(UserDto.LEVEL_CD_STAFF); //鍛樺伐
+ List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
+ if (!ListUtil.isNull(users)) {
+ for (UserDto user : users) {
+ if (!user.getUserId().equals(reqJson.getString("staffId"))) {
+ throw new IllegalArgumentException("鍛樺伐鎵嬫満鍙蜂笉鑳介噸澶嶏紝璇烽噸鏂拌緭鍏�");
+ }
+ }
+ }
}
@Override
@@ -168,19 +181,9 @@
private void modifyStaff(JSONObject paramObj) {
UserPo userPo = BeanConvertUtil.covertBean(paramObj, UserPo.class);
+ userPo.setUserId(paramObj.getString("staffId"));
//鏍规嵁鎵嬫満鍙锋煡璇㈢敤鎴�
- UserDto userDto = new UserDto();
- userDto.setTel(userPo.getTel());
- userDto.setUserFlag("1");
- userDto.setLevelCd(UserDto.LEVEL_CD_STAFF); //鍛樺伐
- List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
- if (!ListUtil.isNull(users)) {
- for (UserDto user : users) {
- if (!user.getUserId().equals(userPo.getUserId())) {
- throw new IllegalArgumentException("鍛樺伐鎵嬫満鍙蜂笉鑳介噸澶嶏紝璇烽噸鏂拌緭鍏�");
- }
- }
- }
+
if (paramObj.containsKey("email") && !StringUtil.isEmpty(paramObj.getString("email"))) {
Assert.isEmail(paramObj, "email", "涓嶆槸鏈夋晥鐨勯偖绠辨牸寮�");
}
@@ -189,7 +192,9 @@
if (flag < 1) {
throw new CmdException("淇濆瓨鐢ㄦ埛寮傚父");
}
-
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userPo.getUserId());
+ List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
//todo 淇敼韬唤璇�
updateStaffIdCard(users.get(0), paramObj);
--
Gitblit v1.8.0