czh преди 2 години
родител
ревизия
40acf3f9c8

+ 1 - 1
sckw-modules/sckw-manage/src/main/java/com/sckw/manage/dubbo/RemoteManageServiceImpl.java

@@ -44,7 +44,7 @@ public class RemoteManageServiceImpl implements RemoteManageService {
             return map;
         }
 
-        List<EntAddressResDto> entAddressResDtoList= BeanUtils.copyToList(kwmAddressList, EntAddressResDto.class);
+        List<EntAddressResDto> entAddressResDtoList = BeanUtils.copyToList(kwmAddressList, EntAddressResDto.class);
         return entAddressResDtoList.stream().collect(Collectors.groupingBy(EntAddressResDto::getEntId));
     }
 }

+ 2 - 2
sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/res/AddressQueryResVo.java

@@ -97,12 +97,12 @@ public class AddressQueryResVo implements Serializable {
     /**
      * 地址类型
      */
-    private String type;
+    private String typeName;
 
     /**
      * 地址类型
      */
-    private Integer typeCode;
+    private Integer type;
 
     /**
      * 修改时间

+ 3 - 3
sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -124,18 +124,18 @@ public class KwmAddressService {
         kwmAddresses.forEach(item -> {
             AddressQueryResVo addressQueryResVo = new AddressQueryResVo();
             BeanUtils.copyProperties(item, addressQueryResVo);
-            addressQueryResVo.setTypeCode(item.getType());
+            addressQueryResVo.setType(item.getType());
             UserCacheResDto userCacheResDto = userCacheResDtoMap.get(item.getCreateBy());
             SysDictResDto sysDictResDto = stringSysDictResDtoMap.get(DictTypeEnum.ADDRESS_TYPE.getType() + Global.POUND + item.getType());
             if (Objects.nonNull(sysDictResDto)) {
-                addressQueryResVo.setType(sysDictResDto.getLabel());
+                addressQueryResVo.setTypeName(sysDictResDto.getLabel());
             }
 
             if (Objects.nonNull(userCacheResDto)) {
                 addressQueryResVo.setCreateByName(userCacheResDto.getName());
             }
             if (Objects.nonNull(sysDictResDto)) {
-                addressQueryResVo.setType(sysDictResDto.getLabel());
+                addressQueryResVo.setTypeName(sysDictResDto.getLabel());
             }
 
             if (Objects.nonNull(item.getDefaultType())) {