wms / wms_ningbohuazhang · Commits

Commit 0f1944094cfcd8d969c3e0ff921e3dc8ec98122c

Authored by mahuandong
2 parents 81f151cc a33281f3

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

# Conflicts:
#	.idea/workspace.xml
Inline Side-by-side
Showing 3 changed files with 4 additions and 4 deletions
src/main/java/com/huaheng/pc/general/company/service/CompanyService.java
  View file @0f19440
... ... @@ -11,7 +11,7 @@ public interface CompanyService extends IService<Company>{
11 11  
12 12 public List<Company> selectCompanyByCurrentUserId();
13 13  
14   - public List<Company> selectCompanyByUserId();
  14 + public List<Company> selectCompanyByUserId(Integer id);
15 15  
16 16 public AjaxResult addCompany(Company company);
17 17  
... ...
src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java
  View file @0f19440
... ... @@ -39,9 +39,9 @@ public class CompanyServiceImpl extends ServiceImpl&lt;CompanyMapper, Company&gt; impl
39 39 * @return
40 40 */
41 41 @Override
42   - public List<Company> selectCompanyByUserId() {
  42 + public List<Company> selectCompanyByUserId(Integer id) {
43 43 UserCompany condition = new UserCompany();
44   - condition.setUserId(ShiroUtils.getUserId());
  44 + condition.setUserId(id);
45 45 List<UserCompany> userCompanys = userCompanyMapper.selectListEntityByEqual(condition);
46 46 Company company = new Company();
47 47 company.setWarehouseCode(ShiroUtils.getWarehouseCode());
... ...
src/main/java/com/huaheng/pc/system/user/controller/UserController.java
  View file @0f19440
... ... @@ -154,7 +154,7 @@ public class UserController extends BaseController
154 154 {
155 155 mmap.put("user", userService.selectUserById(id));
156 156 mmap.put("roles", roleService.selectRolesByUserId(id));
157   - mmap.put("companys", companyService.selectCompanyByUserId());
  157 + mmap.put("companys", companyService.selectCompanyByUserId(id));
158 158 mmap.put("warehouses", warehouseService.selectWarehouseByUserId(id));
159 159 return prefix + "/edit";
160 160 }
... ...