diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/TemplateDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/TemplateDTO.java index b9c43fb0d3..0229316e01 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/TemplateDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/TemplateDTO.java @@ -15,7 +15,11 @@ public class TemplateDTO implements Serializable { /** * 模板ID */ - private String priTmplId; + private String id; + /** + * 模板ID + */ + private String tmplId; /** * 标题 */ diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SubscribeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SubscribeServiceImpl.java index b8ddb28343..1521aa508a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SubscribeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SubscribeServiceImpl.java @@ -331,7 +331,7 @@ public class SubscribeServiceImpl implements SubscribeService { List resiPubTmplIds = wxResiResult.getData().getData().stream().map(WxGetTemplateResult.DataBean::getPriTmplId).collect(Collectors.toList()); List resiList = personalTemplateService.getListByCustomer(formDTO.getResiAppId(), formDTO.getCustomerId(), "resi"); - List resiTmplIds = resiList.stream().map(TemplateDTO::getPriTmplId).collect(Collectors.toList()); + List resiTmplIds = resiList.stream().map(TemplateDTO::getTmplId).collect(Collectors.toList()); List resiReduce = resiPubTmplIds.stream().filter(item -> !resiTmplIds.contains(item)).collect(Collectors.toList()); resiReduce.forEach(tmplId -> { WxDelTemplateReq request = new WxDelTemplateReq(); @@ -354,7 +354,7 @@ public class SubscribeServiceImpl implements SubscribeService { List workPubTmplIds = wxWorkResult.getData().getData().stream().map(WxGetTemplateResult.DataBean::getPriTmplId).collect(Collectors.toList()); List workList = personalTemplateService.getListByCustomer(formDTO.getWorkAppId(), formDTO.getCustomerId(), "work"); - List workTmplIds = workList.stream().map(TemplateDTO::getPriTmplId).collect(Collectors.toList()); + List workTmplIds = workList.stream().map(TemplateDTO::getTmplId).collect(Collectors.toList()); List workReduce = workPubTmplIds.stream().filter(item -> !workTmplIds.contains(item)).collect(Collectors.toList()); workReduce.forEach(tmplId -> { WxDelTemplateReq request = new WxDelTemplateReq(); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PersonalTemplateDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PersonalTemplateDao.xml index 4218ef19f4..f3b46b3c42 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PersonalTemplateDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PersonalTemplateDao.xml @@ -46,7 +46,8 @@