From aab1ad64e309fa904cc9cbeba4d76b533a5b6c71 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 20 八月 2025 16:46:28 +0800
Subject: [PATCH] 暂存0820
---
service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java
index 78cf6ef..bc01744 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java
@@ -148,17 +148,18 @@
List<OwnerDto> curOwners = ownerInnerServiceSMOImpl.queryOwners(curOwner);
Assert.listOnlyOne(curOwners, "鏈煡璇㈠埌涓氫富淇℃伅鎴栨煡璇㈠埌澶氭潯");
-
- OwnerDto ownerDto = new OwnerDto();
- ownerDto.setLink(link);
- ownerDto.setCommunityId(reqJson.getString("communityId"));
- List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryAllOwners(ownerDto);
- if (ownerDtos != null && ownerDtos.size() > 1) {
- throw new IllegalArgumentException("鎵嬫満鍙烽噸澶嶏紝璇烽噸鏂拌緭鍏�");
- } else if (ownerDtos != null && ownerDtos.size() == 1) {
- for (OwnerDto owner : ownerDtos) {
- if (!reqJson.getString("memberId").equals(owner.getMemberId())) {
- throw new IllegalArgumentException("鎵嬫満鍙烽噸澶嶏紝璇烽噸鏂拌緭鍏�");
+ if(StringUtils.isNotEmpty(link)){
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setLink(link);
+ ownerDto.setCommunityId(reqJson.getString("communityId"));
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryAllOwners(ownerDto);
+ if (ownerDtos != null && ownerDtos.size() > 1) {
+ throw new IllegalArgumentException("鎵嬫満鍙烽噸澶嶏紝璇烽噸鏂拌緭鍏�");
+ } else if (ownerDtos != null && ownerDtos.size() == 1) {
+ for (OwnerDto owner : ownerDtos) {
+ if (!reqJson.getString("memberId").equals(owner.getMemberId())) {
+ throw new IllegalArgumentException("鎵嬫満鍙烽噸澶嶏紝璇烽噸鏂拌緭鍏�");
+ }
}
}
}
@@ -171,6 +172,9 @@
//todo 淇敼 涓氫富淇℃伅
OwnerPo ownerPo = BeanConvertUtil.covertBean(reqJson, OwnerPo.class);
+ if(StringUtils.isEmpty(reqJson.getString("link"))){
+ ownerPo.setLink("");
+ }
int flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
if (flag < 1) {
throw new CmdException("淇敼涓氫富澶辫触");
@@ -247,6 +251,13 @@
for (OwnerAppUserDto ownerAppUser : ownerAppUserDtos) {
OwnerAppUserPo ownerAppUserPo = BeanConvertUtil.covertBean(ownerAppUser, OwnerAppUserPo.class);
ownerAppUserPo.setLink(reqJson.getString("link"));
+ if(StringUtils.isEmpty(reqJson.getString("link"))){
+ ownerAppUserPo.setLink("");
+ }
+ if(!ownerAppUser.getState().equals(OwnerAppUserDto.STATE_NOT_AUDIT) && StringUtils.isNotEmpty(ownerAppUser.getLink()) &&
+ !ownerAppUser.getLink().equals(reqJson.getString("link"))){
+ ownerAppUserPo.setState(OwnerAppUserDto.STATE_NOT_AUDIT);
+ }
ownerAppUserV1InnerServiceSMOImpl.updateOwnerAppUser(ownerAppUserPo);
if (StringUtil.isEmpty(ownerAppUser.getUserId())) {
continue;
@@ -258,6 +269,9 @@
UserPo userPo = new UserPo();
userPo.setUserId(ownerAppUserDtos.get(0).getUserId());
userPo.setTel(reqJson.getString("link"));
+ if(StringUtils.isEmpty(reqJson.getString("link"))){
+ userPo.setTel("");
+ }
userV1InnerServiceSMOImpl.updateUser(userPo);
}
}
--
Gitblit v1.8.0