Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # .idea/workspace.xml

Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # .idea/workspace.xml
mahuandong
2 parents 81f151cc a33281f3
Showing 3 changed files with 4 additions and 4 deletions
src/main/java/com/huaheng/pc/general/company/service/CompanyService.java
src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java
src/main/java/com/huaheng/pc/system/user/controller/UserController.java
@@ -11,7 +11,7 @@ public interface CompanyService extends IService&lt;Company&gt;{
     public List<Company> selectCompanyByCurrentUserId();
-    public List<Company> selectCompanyByUserId();
+    public List<Company> selectCompanyByUserId(Integer id);
     public AjaxResult addCompany(Company company);
@@ -39,9 +39,9 @@ public class CompanyServiceImpl extends ServiceImpl&lt;CompanyMapper, Company&gt; impl
      * @return
      */
     @Override
-    public List<Company> selectCompanyByUserId() {
+    public List<Company> selectCompanyByUserId(Integer id) {
         UserCompany condition = new UserCompany();
-        condition.setUserId(ShiroUtils.getUserId());
+        condition.setUserId(id);
         List<UserCompany> userCompanys = userCompanyMapper.selectListEntityByEqual(condition);
         Company company = new Company();
         company.setWarehouseCode(ShiroUtils.getWarehouseCode());
@@ -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());
+        mmap.put("companys", companyService.selectCompanyByUserId(id));
         mmap.put("warehouses", warehouseService.selectWarehouseByUserId(id));
         return prefix + "/edit";
     }