From 47f882588d1d18df404478bc79cc53cb608549a2 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 20 八月 2021 22:20:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xinghong-dev
---
service-user/src/main/java/com/java110/user/smo/impl/OwnerAppUserInnerServiceSMOImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/OwnerAppUserInnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/OwnerAppUserInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index 061a5b9..9f694b2
--- a/service-user/src/main/java/com/java110/user/smo/impl/OwnerAppUserInnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/OwnerAppUserInnerServiceSMOImpl.java
@@ -2,10 +2,13 @@
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.owner.IOwnerAppUserInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.dto.community.CommunityDto;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.owner.OwnerAppUserDto;
+import com.java110.po.owner.OwnerAppUserPo;
import com.java110.user.dao.IOwnerAppUserServiceDao;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +16,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
+import java.util.Map;
/**
* @ClassName FloorInnerServiceSMOImpl
@@ -31,6 +35,9 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+ @Autowired
+ private ICommunityInnerServiceSMO iCommunityInnerServiceSMO;
+
@Override
public List<OwnerAppUserDto> queryOwnerAppUsers(@RequestBody OwnerAppUserDto ownerAppUserDto) {
@@ -43,6 +50,14 @@
}
List<OwnerAppUserDto> ownerAppUsers = BeanConvertUtil.covertBeanList(ownerAppUserServiceDaoImpl.getOwnerAppUserInfo(BeanConvertUtil.beanCovertMap(ownerAppUserDto)), OwnerAppUserDto.class);
+ for (OwnerAppUserDto ownerAppUserDto1 : ownerAppUsers) {
+ CommunityDto communityDto = new CommunityDto();
+ communityDto.setCommunityId(ownerAppUserDto1.getCommunityId());
+ List<CommunityDto> communityDtoList = iCommunityInnerServiceSMO.queryCommunitys(communityDto);
+ if (communityDtoList != null && communityDtoList.size() > 0) {
+ ownerAppUserDto1.setsCommunityTel(communityDtoList.get(0).getTel());
+ }
+ }
return ownerAppUsers;
}
@@ -53,6 +68,14 @@
return ownerAppUserServiceDaoImpl.queryOwnerAppUsersCount(BeanConvertUtil.beanCovertMap(ownerAppUserDto));
}
+ @Override
+ public int updateOwnerAppUser(@RequestBody OwnerAppUserPo ownerAppUserPo) {
+ Map info = BeanConvertUtil.beanCovertMap(ownerAppUserPo);
+ info.put("statusCd", "0");
+ ownerAppUserServiceDaoImpl.updateOwnerAppUserInfoInstance(info);
+ return 0;
+ }
+
public IOwnerAppUserServiceDao getOwnerAppUserServiceDaoImpl() {
return ownerAppUserServiceDaoImpl;
}
--
Gitblit v1.8.0