diff --git a/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java b/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java
index 337921f..c5f398d 100644
--- a/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java
@@ -35,7 +35,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
 
     /**
      *  查询出仓库所有的货主，并且根据用户id查询对应的货主，包含的就将flag赋为true
-     * @param userId
+     * @param
      * @return
      */
     @Override
diff --git a/src/main/java/com/huaheng/pc/system/user/controller/UserController.java b/src/main/java/com/huaheng/pc/system/user/controller/UserController.java
index 43c125d..8aa4411 100644
--- a/src/main/java/com/huaheng/pc/system/user/controller/UserController.java
+++ b/src/main/java/com/huaheng/pc/system/user/controller/UserController.java
@@ -154,7 +154,7 @@ public class UserController extends BaseController
     {
         mmap.put("user", userService.selectUserById(id));
         mmap.put("roles", roleService.selectRolesByUserId(id));
-        mmap.put("companys", companyService.selectCompanyByUserId(id));
+        mmap.put("companys", companyService.selectCompanyByUserId());
         mmap.put("warehouses", warehouseService.selectWarehouseByUserId(id));
         return prefix + "/edit";
     }