Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/shinestar/modules/mobile/controller/AdjustShiftApiController.java

@@ -186,13 +186,23 @@ public class AdjustShiftApiController {
             PersonPopedom personPopedom = personPopedomService.get(person.getPopedom());
             CompanyInfo companyInfo = companyInfoService.get(personPopedom.getCompanyId());
 
-            List<CompanyInfo> companyInfoList =  companyInfoService.findAllCompanyByCode("%"+companyInfo.getId()+"%");
+            List<CompanyInfo> companyInfoList =  companyInfoService.findAllCompanyByCode(companyInfo.getCode()+"%");
+            List<String> companyIdList = Arrays.asList(companyInfo.getCode().split(","));
+            if (companyIdList.size()>0){
+                for (String id : companyIdList){
+                    CompanyInfo companyInfo1 = companyInfoService.get(id);
+                    if (!companyInfoList.contains(companyInfo1)){
+                        companyInfoList.add(companyInfo1);
+                    }
+                }
+            }
+
 
             Map<String, Object> searchParams = new HashMap<>();
             searchParams.put("inCompanyId", companyInfoList);
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("b.number_", "asc"));
-            Page<WorkShiftCompany> page = workShiftCompanyService.pageSearch(searchParams, pageIndex, 100, true, sortList);
+            Page<WorkShiftCompany> page = workShiftCompanyService.pageSearch(searchParams, pageIndex, 10000, true, sortList);
 
             List<WorkShiftCompany> workShiftCompanyList = page.getResult();
             List<OwnerShiftDTO> list = new ArrayList<>();