优化代码

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

@@ -11,9 +11,12 @@ import com.java110.dto.owner.OwnerDto;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.community.IMenuInnerServiceSMO;
 import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.api.ApiOwnerDataVo;
 import com.java110.vo.api.ApiOwnerVo;
@@ -85,12 +88,20 @@ public class QueryOwnerMembersCmd extends Cmd {
                 }
             }
         }
+        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
+
         for (OwnerDto ownerdto : ownerDtoList) {
             FileRelDto fileRelDto = new FileRelDto();
             fileRelDto.setObjId(ownerdto.getMemberId());
             List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
-            if (fileRelDtos != null && fileRelDtos.size() > 0) {
+            if (ListUtil.isNull(fileRelDtos)) {
+                continue;
+            }
+            ownerdto.setUrl(fileRelDtos.get(0).getFileSaveName());
+            if (fileRelDtos.get(0).getFileSaveName().startsWith("http")) {
                 ownerdto.setUrl(fileRelDtos.get(0).getFileSaveName());
+            } else {
+                ownerdto.setUrl(imgUrl + fileRelDtos.get(0).getFileSaveName());
             }
         }
         ApiOwnerVo apiOwnerVo = new ApiOwnerVo();

service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java

@@ -18,6 +18,7 @@ import com.java110.user.bmo.owner.IQueryOwnerStatisticsBMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.api.ApiOwnerDataVo;
 import com.java110.vo.api.ApiOwnerVo;
@@ -150,7 +151,7 @@ public class QueryOwnersCmd extends Cmd {
                 fileRelDto.setObjId(tmpOwnerDto.getMemberId());
                 fileRelDto.setRelTypeCd("10000"); //业主照片
                 List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
-                if (fileRelDtos != null && fileRelDtos.size() > 0) {
+                if (!ListUtil.isNull(fileRelDtos)) {
                     List<String> urls = new ArrayList<>();
                     for (FileRelDto fileRel : fileRelDtos) {
                         urls.add(fileRel.getFileRealName());
@@ -207,7 +208,7 @@ public class QueryOwnersCmd extends Cmd {
         });
         List<OwnerDto> ownerMembers = ownerInnerServiceSMOImpl.queryOwnerMembers(tmpOwnerMemberDto);
 
-        if (ownerMembers == null || ownerMembers.size() < 1) {
+        if (ListUtil.isNull(ownerMembers)) {
             ownerDto.setOwnerId("-1"); // 写入-1 查询不到数据
             return;
         }

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

@@ -19,6 +19,7 @@ import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.OwnerTypeConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -72,7 +73,7 @@ public class OwnerInnerServiceSMOImpl extends BaseServiceSMO implements IOwnerIn
 
         List<OwnerDto> owners = BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.getOwnerInfo(ownerInfo), OwnerDto.class);
 
-        if (owners == null || owners.size() == 0) {
+        if (ListUtil.isNull(owners)) {
             return owners;
         }