|
@@ -20,6 +20,8 @@ import com.yunzhi.marketing.common.StringUtils;
|
20
|
20
|
import com.yunzhi.marketing.mapper.TaRoleMapper;
|
21
|
21
|
import com.yunzhi.marketing.entity.*;
|
22
|
22
|
import com.yunzhi.marketing.service.*;
|
|
23
|
+import com.yunzhi.marketing.xlk.entity.Institution;
|
|
24
|
+import com.yunzhi.marketing.xlk.service.IInstitutionService;
|
23
|
25
|
import io.jsonwebtoken.lang.Collections;
|
24
|
26
|
import io.swagger.annotations.Api;
|
25
|
27
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -87,6 +89,9 @@ public class TaUserController extends BaseController {
|
87
|
89
|
@Autowired
|
88
|
90
|
private ITaMiniappService iTaMiniappService;
|
89
|
91
|
|
|
92
|
+ @Autowired
|
|
93
|
+ private IInstitutionService iInstitutionService;
|
|
94
|
+
|
90
|
95
|
/**
|
91
|
96
|
* 分页查询列表
|
92
|
97
|
* @param pageNum
|
|
@@ -313,7 +318,9 @@ public class TaUserController extends BaseController {
|
313
|
318
|
//获取所有菜单
|
314
|
319
|
List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId(), roles).getData();
|
315
|
320
|
List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
|
316
|
|
-
|
|
321
|
+ // 获取所有组织架构
|
|
322
|
+ List<Institution> institutionList = iInstitutionService.getAllByUser(taUser);
|
|
323
|
+ taUser.setInstitutionList(institutionList);
|
317
|
324
|
|
318
|
325
|
userMap.put("taUser", taUser);
|
319
|
326
|
userMap.put("menuList", allMenus);
|