From 78adad25c5a6cf361b3f4cb4b38c2ab7662fbe82 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 18 Jan 2017 16:46:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?= =?UTF-8?q?=E6=A3=80=E5=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/UsersController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index 1fc6bff..36d76f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.OrganizationGroupsService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; @@ -18,6 +19,7 @@ import com.lyms.platform.operate.web.session.SessionProvider; import com.lyms.platform.operate.web.session.strategy.ISessionProvider; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; +import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.DataPermissionsModel; import com.lyms.platform.pojo.OrganizationGroups; import org.apache.commons.collections.CollectionUtils; @@ -74,6 +76,8 @@ public class UsersController extends BaseController { private SessionProvider iSessionProvider; @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private BasicConfigService basicConfigService; private static final String LYMS = "龙源美生"; @@ -479,6 +483,15 @@ public class UsersController extends BaseController { organizations = organizationService.queryOrganization(organizationQuery); } else { Organization organization = organizationService.getOrganization(users.getOrgId()); + if(null!=organization&&StringUtils.isNotEmpty(organization.getCityId())){ + BasicConfig bg= basicConfigService.getOneBasicConfigById(organization.getCityId()); + Map map = new HashMap<>(); + map.put("id",organization.getCityId()); + if(null!=bg){ + map.put("name",bg.getName()); + } + organization.setCity(map); + } organizations.add(organization); users.setOrganization(organization); //是否是建档医院 -- 1.8.3.1