wuxw hace 1 año
padre
commit
b6e67d6a84

+ 10 - 0
java110-bean/src/main/java/com/java110/dto/user/LoginOwnerResDto.java

@@ -34,6 +34,8 @@ public class LoginOwnerResDto implements Serializable {
 
 
     private String ownerTypeCd;
     private String ownerTypeCd;
 
 
+    private String communityQrCode;
+
 
 
     public String getUserId() {
     public String getUserId() {
         return userId;
         return userId;
@@ -138,4 +140,12 @@ public class LoginOwnerResDto implements Serializable {
     public void setCommunityTel(String communityTel) {
     public void setCommunityTel(String communityTel) {
         this.communityTel = communityTel;
         this.communityTel = communityTel;
     }
     }
+
+    public String getCommunityQrCode() {
+        return communityQrCode;
+    }
+
+    public void setCommunityQrCode(String communityQrCode) {
+        this.communityQrCode = communityQrCode;
+    }
 }
 }

+ 1 - 1
service-job/src/main/java/com/java110/job/export/adapt/DataFeeManualCollectionAdapt.java

@@ -374,7 +374,7 @@ public class DataFeeManualCollectionAdapt implements IExportDataAdapt {
         tmpFeeDto.setConfigIds(configIds.split(","));
         tmpFeeDto.setConfigIds(configIds.split(","));
         List<FeeDto> feeDtos = feeInnerServiceSMOImpl.querySimpleFees(tmpFeeDto);
         List<FeeDto> feeDtos = feeInnerServiceSMOImpl.querySimpleFees(tmpFeeDto);
 
 
-        if (feeDtos == null || feeDtos.size() < 1) {
+        if (ListUtil.isNull(feeDtos)) {
             return null;
             return null;
         }
         }
 
 

+ 1 - 0
service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java

@@ -159,6 +159,7 @@ public class OwnerUserLoginCmd extends Cmd {
         loginOwnerResDto.setCommunityId(communityDtos.get(0).getCommunityId());
         loginOwnerResDto.setCommunityId(communityDtos.get(0).getCommunityId());
         loginOwnerResDto.setCommunityName(communityDtos.get(0).getName());
         loginOwnerResDto.setCommunityName(communityDtos.get(0).getName());
         loginOwnerResDto.setCommunityTel(communityDtos.get(0).getTel());
         loginOwnerResDto.setCommunityTel(communityDtos.get(0).getTel());
+        loginOwnerResDto.setCommunityQrCode(communityDtos.get(0).getQrCode());
         loginOwnerResDto.setUserId(tmpUserDto.getUserId());
         loginOwnerResDto.setUserId(tmpUserDto.getUserId());
         loginOwnerResDto.setUserName(tmpUserDto.getName());
         loginOwnerResDto.setUserName(tmpUserDto.getName());
         loginOwnerResDto.setOwnerTel(tmpUserDto.getTel());
         loginOwnerResDto.setOwnerTel(tmpUserDto.getTel());