Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/LabourApiController.java

@@ -118,7 +118,9 @@ public class LabourApiController {
                     labourServices.setApprovePersonName(curUser.getRealName());
                 }
 
-                Company company = companyService.get(user.getCompanyId());
+
+                User user1 = userService.get(labourServices.getCreateBy());
+                Company company = companyService.get(user1.getCompanyId());
 
                 if(company!=null) {
                     labourServices.setCompanyName(company.getName());