Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

@@ -658,6 +658,7 @@
             INNER JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID )
         WHERE
             r.CUSTOMER_ID = #{customerId}
+            AND r.DEL_FLAG = '0'
             AND r.STATUS = 'finished'
             <foreach item="serverId" collection="serverIds" open="AND (" separator="or" close=")" index="">
                  s.SERVER_ID = #{serverId}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -1418,9 +1418,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 options = getResultDataOrThrowsException(epmetHeartOpenFeignClient.getDemandOptions(), ServiceConstant.EPMET_USER_SERVER,
                         EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
                 break;
+            case "/resi/partymember/icPartyOrg/branchlist":
+                options = this.listBranchOptions();
+                break;
         }
         if (options == null) {
-            return null;
+            return new HashMap<>();
         }
         //结果平铺展开
         Map<String, OptionResultDTO> resultMap = new HashMap<>();