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/UserLoginCmd.java |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/user/UserLoginCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/UserLoginCmd.java
index 5b34277..050d396 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/UserLoginCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/UserLoginCmd.java
@@ -11,26 +11,21 @@
 import com.java110.dto.app.AppDto;
 import com.java110.dto.community.CommunityDto;
 import com.java110.dto.msg.SmsDto;
-import com.java110.dto.owner.OwnerAppUserDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.user.UserAttrDto;
 import com.java110.dto.user.UserDto;
 import com.java110.intf.common.ISmsInnerServiceSMO;
 import com.java110.intf.community.ICommunityInnerServiceSMO;
-import com.java110.intf.community.ICommunityV1InnerServiceSMO;
 import com.java110.intf.user.*;
 import com.java110.po.owner.OwnerAppUserPo;
 import com.java110.po.user.UserPo;
-import com.java110.po.userAttr.UserAttrPo;
+import com.java110.po.user.UserAttrPo;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.UserLevelConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.exception.SMOException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.StringUtil;
-import com.java110.utils.util.ValidatorUtil;
+import com.java110.utils.util.*;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -118,10 +113,10 @@
         List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
 
         //todo 楠岃瘉鐮佺櫥褰曪紝鍒ゆ柇鏄惁鏄惁涓氫富锛屽苟涓旀槸鍚︾粦瀹氬叧绯� 濡傛灉娌℃湁 鑷姩缁戝畾鍏崇郴
-        if (userDtos == null || userDtos.size() < 1) {
+        if (ListUtil.isNull(userDtos)) {
             userDtos = ifOwnerLoginByPhone(reqJson, context);
         }
-        if (userDtos == null || userDtos.size() < 1) {
+        if (ListUtil.isNull(userDtos)) {
             throw new SMOException(errorInfo);
         }
 

--
Gitblit v1.8.0