|
@@ -54,6 +54,7 @@ public class BackgroundProcessingController extends BaseRESTfulController {
|
|
|
Map<String, Object> userInfo = (Map<String, Object>) dataMap.get("user");
|
|
Map<String, Object> userInfo = (Map<String, Object>) dataMap.get("user");
|
|
|
// 根据用户名去查询该用户绑定的公司及下属公司;7.2改为只查本单位因前端会报错
|
|
// 根据用户名去查询该用户绑定的公司及下属公司;7.2改为只查本单位因前端会报错
|
|
|
List<Map<String, Object>> companyList = backgroundProcessingMapper.getCurrentCompanyList(loginName);
|
|
List<Map<String, Object>> companyList = backgroundProcessingMapper.getCurrentCompanyList(loginName);
|
|
|
|
|
+
|
|
|
//List<Map<String, Object>> companyList = backgroundProcessingMapper.getCompanyList(loginName);
|
|
//List<Map<String, Object>> companyList = backgroundProcessingMapper.getCompanyList(loginName);
|
|
|
if(companyList != null && companyList.size() > 0) {
|
|
if(companyList != null && companyList.size() > 0) {
|
|
|
Map<String, Object> stringMap = new HashMap<>();
|
|
Map<String, Object> stringMap = new HashMap<>();
|
|
@@ -67,6 +68,7 @@ public class BackgroundProcessingController extends BaseRESTfulController {
|
|
|
//return resMap;
|
|
//return resMap;
|
|
|
}
|
|
}
|
|
|
Map<String,Object> rootCompanyMap = backgroundProcessingMapper.getCompanyRootMap(loginName);
|
|
Map<String,Object> rootCompanyMap = backgroundProcessingMapper.getCompanyRootMap(loginName);
|
|
|
|
|
+ //根据companyList查询名字相同的
|
|
|
userInfo.put("dilCompanyList", companyList);
|
|
userInfo.put("dilCompanyList", companyList);
|
|
|
if (rootCompanyMap != null && rootCompanyMap.get("isListed") != null) {
|
|
if (rootCompanyMap != null && rootCompanyMap.get("isListed") != null) {
|
|
|
userInfo.put("rootCompanyMap",rootCompanyMap);
|
|
userInfo.put("rootCompanyMap",rootCompanyMap);
|