1

winsea-haixin-platform-backend/src/main/java/com/yh/saas/platform/controller/StaffController.java

@@ -137,7 +137,7 @@ public class StaffController {
 	public List<CommonStaff> getStaffListByCompId(String compId,String warehouseId) {
 		if(warehouseId != null && !warehouseId.isEmpty()){
 			WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectById(warehouseId);
-			String phones = warehouseBaseInfo.getPersonPhone()+","+warehouseBaseInfo.getOtherPersonPhone();
+			String phones = warehouseBaseInfo.getOtherPersonPhone()!=null?warehouseBaseInfo.getPersonPhone()+","+warehouseBaseInfo.getOtherPersonPhone():warehouseBaseInfo.getPersonPhone();
 
 			return staffService.selectList(new EntityWrapper<CommonStaff>().eq("comp_id", compId).in("staff_mobile_phone",phones));
 		}