会议管理修改BUG

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

@@ -185,11 +185,20 @@ public class MeetingInfoController {
 
                     PersonInfo personInfo = personInfoService.get(meetingPerson.getPersonId());
 
-                    MeetingPersonDTO dto = new MeetingPersonDTO();
-                    dto.setKey(personInfo.getId().toString());
-                    dto.setLabel(personInfo.getName());
+                    if(personInfo!=null) {
+                        CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
+                        String companyName="";
 
-                    dtoList.add(dto);
+                        if(companyInfo!=null){
+                            companyName = "-"+companyInfo.getName();
+                        }
+
+                        MeetingPersonDTO dto = new MeetingPersonDTO();
+                        dto.setKey(personInfo.getId().toString());
+                        dto.setLabel(personInfo.getName()+ companyName);
+
+                        dtoList.add(dto);
+                    }
                 }
 
                 if(StringUtils.isNotEmpty(selectPersonKey)){
@@ -518,9 +527,16 @@ public class MeetingInfoController {
             List<MeetingPersonDTO> dtoList = new ArrayList<>();
 
             for (PersonInfo personInfo:list) {
+                CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
+                String companyName="";
+
+                if(companyInfo!=null){
+                    companyName = "-"+companyInfo.getName();
+                }
+
                 MeetingPersonDTO dto = new MeetingPersonDTO();
                 dto.setKey(personInfo.getId().toString());
-                dto.setLabel(personInfo.getName());
+                dto.setLabel(personInfo.getName() + companyName);
 //                CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
 //                if(companyInfo!=null) {
 //                    dto.setCompanyName(companyInfo.getName());