diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageService.java index 7d79fd8b..1ef45a3f 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageService.java @@ -60,20 +60,19 @@ public class TemplateMessageService extends MybatisBaseService pagging = baseMapper.listAll(templateMessageTypeVo.getSid()); List list1=projectTemplateMapper.getTempSidByProjectSid(sid); int i=0; - for(String s :list1){ - for(TemplateMessageVo t:pagging){ + for(TemplateMessageVo t:pagging){ + for(String s :list1){ if(s.equals(t.getSid())){ t.setState("2"); i++; - }else{ - t.setState("1"); } } } + templateMessageTypeVo.setList(pagging); if(i==pagging.size()){ templateMessageTypeVo.setState("2"); } - templateMessageTypeVo.setList(pagging); + } return list; }