Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/shinestar/modules/base/controller/MeetingInfoController.java

@@ -136,10 +136,11 @@ public class MeetingInfoController {
         MessageResult<MeetingInfo> msgResult = new MessageResult<>();
 
         try {
+            long beginTime = System.currentTimeMillis();
+
             MeetingInfo meetingInfo = meetingInfoService.get(id);
 
             if (meetingInfo != null) {
-
                 List<MeetingTime> meetingTimeList = meetingTimeService.findByMeetingId(meetingInfo.getId());
 
                 for (MeetingTime meetingTime:meetingTimeList) {
@@ -171,6 +172,9 @@ public class MeetingInfoController {
                     }
                 }
 
+                logger.error("meetingTimeService.findByMeetingId 耗时:" + (System.currentTimeMillis() - beginTime));
+                beginTime = System.currentTimeMillis();
+
                 List<MeetingTime> removeMeetingTimeList = new ArrayList<>();
 
                 meetingInfo.setMeetingTimeDataList(meetingTimeList);
@@ -178,6 +182,8 @@ public class MeetingInfoController {
 
                 List<MeetingPerson> list = meetingPersonService.findByMeetingId(meetingInfo.getId());
 
+                logger.error("meetingPersonService.findByMeetingId 耗时:" + (System.currentTimeMillis() - beginTime));
+                beginTime = System.currentTimeMillis();
 
                 String selectPersonKey = "";
 
@@ -191,16 +197,6 @@ public class MeetingInfoController {
                     dto.setLabel(meetingPerson.getPersonName() + "-" + meetingPerson.getCompanyName());
 
                     dtoList.add(dto);
-//                    PersonInfo personInfo = personInfoService.get(meetingPerson.getPersonId());
-//
-//                    if(personInfo!=null) {
-//                        CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
-//                        String companyName="";
-//
-//                        if(companyInfo!=null){
-//                            companyName = "-"+companyInfo.getName();
-//                        }
-//                    }
                 }
 
                 if(StringUtils.isNotEmpty(selectPersonKey)){
@@ -526,11 +522,9 @@ public class MeetingInfoController {
             if(StringUtils.isNotEmpty(companyId)){
                 String[] companyIdArray = companyId.split(",");
 
-                List<PersonInfo> curPersonList = new ArrayList<>();
-
                 for (String companyIdStr:companyIdArray) {
                     CompanyInfo companyInfo = companyInfoService.get(companyIdStr);
-                    curPersonList = personInfoService.findListByCompanyCode(companyInfo.getCode() + "%");
+                    List<PersonInfo> curPersonList = personInfoService.findListByCompanyCode(companyInfo.getCode() + "%");
 
                     if(curPersonList.size()>0){
                         list.addAll(curPersonList);
@@ -542,13 +536,18 @@ public class MeetingInfoController {
             }
 
             List<MeetingPersonDTO> dtoList = new ArrayList<>();
+            Set<Long> personIdSet = new HashSet<>();
 
             for (PersonInfo personInfo:list) {
-                MeetingPersonDTO dto = new MeetingPersonDTO();
-                dto.setKey(personInfo.getId().toString());
-                dto.setLabel(personInfo.getName() + "-" + personInfo.getCompanyName());
+                if(!personIdSet.contains(personInfo.getId())){
+                    MeetingPersonDTO dto = new MeetingPersonDTO();
+                    dto.setKey(personInfo.getId().toString());
+                    dto.setLabel(personInfo.getName() + "-" + personInfo.getCompanyName());
+
+                    dtoList.add(dto);
 
-                dtoList.add(dto);
+                    personIdSet.add(personInfo.getId());
+                }
             }
 
             msgResult.setResult(true);