会议添加人员问题

common/src/main/java/com/jpsoft/shinestar/modules/base/entity/MeetingInfo.java

@@ -61,4 +61,6 @@ public class MeetingInfo {
 	private List<MeetingPersonDTO> selectPersonDto;
 
 	private String searchCompanyId;
+
+	private String[] searchCompanyIds;
 }

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

@@ -203,7 +203,11 @@ public class MeetingInfoController {
 
                 if(StringUtils.isNotEmpty(selectPersonKey)){
                     selectPersonKey = selectPersonKey.substring(0,selectPersonKey.lastIndexOf(","));
+                }
 
+                if(StringUtils.isNotEmpty(meetingInfo.getSearchCompanyId())){
+                    String[] arrCompanyId = meetingInfo.getSearchCompanyId().split(",");
+                    meetingInfo.setSearchCompanyIds(arrCompanyId);
                 }
 
                 meetingInfo.setSelectPersonDto(dtoList);
@@ -515,10 +519,20 @@ public class MeetingInfoController {
         MessageResult<List<MeetingPersonDTO>> msgResult = new MessageResult<>();
 
         try {
-            List<PersonInfo> list;
+            List<PersonInfo> list = new ArrayList<>();
+
+            if(StringUtils.isNotEmpty(companyId)){
+                String[] companyIdArray = companyId.split(",");
+
+                List<PersonInfo> curPersonList = new ArrayList<>();
 
-            if(StringUtils.isNotEmpty(companyId)) {
-                list = personInfoService.findListByCompanyCode("%"+companyId+"%");
+                for (String companyIdStr:companyIdArray) {
+                    curPersonList = personInfoService.findListByCompanyCode("%"+companyIdStr+"%");
+
+                    if(curPersonList.size()>0){
+                        list.addAll(curPersonList);
+                    }
+                }
             }
             else{
                 list = personInfoService.list();
@@ -537,11 +551,6 @@ public class MeetingInfoController {
                 MeetingPersonDTO dto = new MeetingPersonDTO();
                 dto.setKey(personInfo.getId().toString());
                 dto.setLabel(personInfo.getName() + companyName);
-//                CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
-//                if(companyInfo!=null) {
-//                    dto.setCompanyName(companyInfo.getName());
-//                }
-//                dto.setJobNumber(personInfo.getJobNumber());
 
                 dtoList.add(dto);
             }