Browse Source

优化代码

wuxw 1 year ago
parent
commit
21da57799c

+ 2 - 1
service-user/src/main/java/com/java110/user/cmd/owner/QueryCurrentOwnerCmd.java

@@ -14,6 +14,7 @@ import com.java110.intf.user.IOwnerAttrInnerServiceSMO;
 import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.ListUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,7 +78,7 @@ public class QueryCurrentOwnerCmd extends Cmd {
         //ownerAppUserDto.setMemberId(reqJson.getString("memberId"));
         List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
 
-        if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
+        if (ListUtil.isNull(ownerAppUserDtos)) {
             throw new CmdException("未绑定业主");
         }
 

+ 14 - 10
service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerMembersCmd.java

@@ -75,17 +75,21 @@ public class QueryOwnerMembersCmd extends Cmd {
         basePrivilegeDto.setResource("/roomCreateFee");
         basePrivilegeDto.setUserId(userId);
         privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
-        if (privileges == null || privileges.size() == 0) {
+        if (ListUtil.isNull(privileges)) {
             for (OwnerDto owner : ownerDtos) {
-                String idCard = owner.getIdCard();
-                if (!StringUtil.isEmpty(idCard)) {
-                    idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
-                    owner.setIdCard(idCard);
-                }
-                String link = owner.getLink();
-                if (!StringUtil.isEmpty(link)) {
-                    link = link.substring(0, 3) + "****" + link.substring(7);
-                    owner.setLink(link);
+                try {
+                    String idCard = owner.getIdCard();
+                    if (!StringUtil.isEmpty(idCard)) {
+                        idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
+                        owner.setIdCard(idCard);
+                    }
+                    String link = owner.getLink();
+                    if (!StringUtil.isEmpty(link)) {
+                        link = link.substring(0, 3) + "****" + link.substring(7);
+                        owner.setLink(link);
+                    }
+                }catch (Exception e){
+                    e.printStackTrace();
                 }
             }
         }