Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java

@@ -242,12 +242,15 @@ public class TagCustomerServiceImpl extends BaseServiceImpl<TagCustomerDao, TagC
             int communityTotal = communityRes.getData().size();
             int num = 0;
             for (TagCustomerEntity tag : tagList) {
+                tagScopeDao.deleteByTagId(tag.getId(),tag.getCustomerId());
                 for (AgencyResultDTO agencyResultDTO : communityRes.getData()) {
                     TagScopeEntity tagScopeEntity = new TagScopeEntity();
                     tagScopeEntity.setCustomerId(tag.getCustomerId());
                     tagScopeEntity.setTagId(tag.getId());
                     tagScopeEntity.setAgencyId(agencyResultDTO.getAgencyId());
                     tagScopeEntity.setOrgIdPath(agencyResultDTO.getOrgIdPath());
+                    tagScopeEntity.setAgencyName(agencyResultDTO.getAgencyName());
+                    tagScopeEntity.setPid(agencyResultDTO.getPid());
                     tagScopeDao.insert(tagScopeEntity);
                     num++;
                 }

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml

@@ -26,7 +26,9 @@
     <select id="selectScope" parameterType="java.lang.String" resultType="com.epmet.dto.TagScopeDTO">
         select ts.TAG_ID,
                ts.AGENCY_ID,
-               ts.ORG_ID_PATH
+               ts.ORG_ID_PATH,
+               ts.AGENCY_NAME,
+               TS.PID
         from tag_scope ts
         where ts.del_flag='0'
           and ts.TAG_ID=#{tagId}