Merge remote-tracking branch 'origin/dev' into 市北生产

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -26,7 +26,9 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -811,6 +813,13 @@ public class AgencyServiceImpl implements AgencyService {
             throw new EpmetException("未查询到工作人员信息"+staffInfo.getStaffId());
         }
         String agencyId = staffInfo.getAgencyId();
+        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId);
+        if (null == agencyInfo){
+            throw new EpmetException("查询组织信息失败"+agencyInfo);
+        }
+        if (agencyInfo.getLevel().equals(CustomerAgencyConstant.COMMUNITY_LEVEL)){
+            return new ArrayList<>();
+        }
         return customerAgencyDao.getCommunityList(tokenDto.getCustomerId(), agencyId);
     }
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java

@@ -32,7 +32,7 @@ public class CollectListExcelResultDTO implements Serializable {
     /**
      * 房屋类型，1:自有, 0:租住
      */
-    @Excel(name = "房屋类型",replace = { "自有_1", "租住_2"}, width = 30, needMerge = true)
+    @Excel(name = "房屋类型",replace = { "自有_1", "租住_0"}, width = 30, needMerge = true)
     private String houseType;
 
     /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java

@@ -42,7 +42,7 @@ public class CollectListMemberExcelResultDTO implements Serializable {
     /**
      * 疫苗是否全程接种，1：全程接种，2：未全程接种，3：为接种
      */
-    @Excel(name = "疫苗接种情况",replace = { "全程接种_1", "未全程接种_2", "未接种_3" }, width = 30)
+    @Excel(name = "疫苗接种情况",replace = { "全程接种_1", "未全程接种_2", "未接种_0" }, width = 30)
     private String ymjz;
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java

@@ -91,7 +91,7 @@ public class IcResiCollectController {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setPage(false);
         PageData<CollectListResultDTO> collectList = icResiCollectService.getCollectList(formDTO);
-        List<CollectListExcelResultDTO> list = ConvertUtils.sourceToTarget(collectList.getList(),CollectListExcelResultDTO.class);
+        List<CollectListExcelResultDTO> list =new ArrayList<>();
 
         collectList.getList().forEach(o->{
             List<CollectListMemberExcelResultDTO> children = new ArrayList<>();