优化代码

java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml

@@ -137,14 +137,10 @@
         communityId,t.app_type_cd,t.app_type_cd appTypeCd,t.b_id,t.b_id bId,t.member_id,t.member_id memberId,
         td1.name stateName,t.user_id,t.user_id userId,t.app_type,t.app_type appType,t.create_time createTime,
         bo.owner_id ownerId,bo.owner_type_cd ownerTypeCd
-        from owner_app_user t,t_dict td1,building_owner bo
+        from owner_app_user t
+        left join t_dict td1 on t.state = td1.status_cd and td1.table_name = 'owner_app_user' and td1.table_columns = 'state'
+        left join building_owner bo on t.member_id = bo.member_id and t.community_id = bo.community_id and bo.status_cd = '0'
         where 1 =1
-        and t.state = td1.status_cd
-        and td1.table_name = 'owner_app_user'
-        and td1.table_columns = 'state'
-        and t.member_id = bo.member_id
-        and t.community_id = bo.community_id
-        and bo.status_cd = '0'
         <if test="idCard !=null and idCard != ''">
             and t.id_card= #{idCard}
         </if>

service-api/src/main/java/com/java110/api/controller/app/OwnerController.java

@@ -247,7 +247,6 @@ public class OwnerController extends BaseController {
             return responseEntity;
         }
 
-        /*IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);*/
         String appId = request.getHeader("APP_ID");
         if (StringUtil.isEmpty(appId)) {
             appId = request.getHeader("APP-ID");

service-api/src/main/java/com/java110/api/listener/owner/ListAppUserBindingOwnersListener.java

@@ -12,6 +12,7 @@ import com.java110.dto.community.CommunityDto;
 import com.java110.dto.owner.OwnerAppUserDto;
 import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
@@ -67,17 +68,6 @@ public class ListAppUserBindingOwnersListener extends AbstractServiceApiListener
 
         Map<String, String> headers = event.getDataFlowContext().getRequestHeaders();
 
-        //     String userId = headers.get("userid");
-
-        //根据userId 查询openId
-//        UserDto userDto = new UserDto();
-//        userDto.setUserId(userId);
-//        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
-//
-//        Assert.listOnlyOne(userDtos, "未找到相应用户信息，或查询到多条");
-//
-//        String openId = userDtos.get(0).getOpenId();
-
         if (!reqJson.containsKey("page")) {
             reqJson.put("page", 1);
         }
@@ -141,6 +131,9 @@ public class ListAppUserBindingOwnersListener extends AbstractServiceApiListener
     private String[] getCommunityIds(List<OwnerAppUserDto> ownerAppUserDtos) {
         List<String> communityIds = new ArrayList<String>();
         for (OwnerAppUserDto ownerAppUserDto : ownerAppUserDtos) {
+            if (StringUtil.isEmpty(ownerAppUserDto.getCommunityId()) || "-1".equals(ownerAppUserDto.getCommunityId())) {
+                continue;
+            }
             communityIds.add(ownerAppUserDto.getCommunityId());
         }
 

service-user/src/main/java/com/java110/user/smo/impl/OwnerAppUserInnerServiceSMOImpl.java

@@ -2,15 +2,16 @@ package com.java110.user.smo.impl;
 
 
 import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
 import com.java110.dto.community.CommunityDto;
+import com.java110.dto.owner.OwnerAppUserDto;
 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 com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -51,6 +52,9 @@ public class OwnerAppUserInnerServiceSMOImpl extends BaseServiceSMO implements I
 
         List<OwnerAppUserDto> ownerAppUsers = BeanConvertUtil.covertBeanList(ownerAppUserServiceDaoImpl.getOwnerAppUserInfo(BeanConvertUtil.beanCovertMap(ownerAppUserDto)), OwnerAppUserDto.class);
         for (OwnerAppUserDto ownerAppUserDto1 : ownerAppUsers) {
+            if (StringUtil.isEmpty(ownerAppUserDto1.getCommunityId()) || "-1".equals(ownerAppUserDto1.getCommunityId())) {
+                continue;
+            }
             CommunityDto communityDto = new CommunityDto();
             communityDto.setCommunityId(ownerAppUserDto1.getCommunityId());
             List<CommunityDto> communityDtoList = iCommunityInnerServiceSMO.queryCommunitys(communityDto);