Merge branch 'develop' into release_temp

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

@@ -279,7 +279,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
         relationEntity.setCustomerId(formDTO.getCustomerId());
         relationEntity.setIcNatId(formDTO.getIcNatId());
         relationEntity.setAgencyId(staffInfo.getAgencyId());
-        relationEntity.setPids(StringUtils.isNotBlank(staffInfo.getAgencyPIds())?staffInfo.getAgencyPIds()+":"+formDTO.getAgencyId():staffInfo.getAgencyId());
+        relationEntity.setPids(StringUtils.isNotBlank(staffInfo.getAgencyPIds())?staffInfo.getAgencyPIds()+":"+staffInfo.getAgencyId():staffInfo.getAgencyId());
         relationEntity.setUserType("synchro");
         icNatRelationDao.insert(relationEntity);
     }