diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/OrganizationMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/OrganizationMapper.java index 20c670f..b26ecb4 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/OrganizationMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/OrganizationMapper.java @@ -18,4 +18,6 @@ public interface OrganizationMapper { public List queryOrganization(OrganizationQuery query); + List queryProvinceIdByOrgId(List orgList); + } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java index 6380fbc..f5761a4 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java @@ -18,4 +18,6 @@ public interface OrganizationService { public List queryOrganization(OrganizationQuery query); + List queryProvinceIdByOrgId(List orgId); + } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java index baaa1b0..c4c2ce5 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java @@ -7,26 +7,48 @@ import com.lyms.platform.permission.service.OrganizationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @Service public class OrganizationServiceImpl implements OrganizationService { -@Autowired -private OrganizationMapper organizationMapper; - -@Override -public Integer addOrganization(Organization obj){ return organizationMapper.addOrganization(obj);} -@Override -public void updateOrganization(Organization obj){organizationMapper.updateOrganization(obj);} -@Override -public void deleteOrganization (Integer id){organizationMapper.deleteOrganization(id);} -@Override -public Organization getOrganization (Integer id){return organizationMapper.getOrganization(id);} -@Override -public int queryOrganizationCount (OrganizationQuery query){return organizationMapper.queryOrganizationCount(query);} -@Override -public List queryOrganization (OrganizationQuery query){if (query.getNeed() != null) {query.mysqlBuild(organizationMapper.queryOrganizationCount(query));}return organizationMapper.queryOrganization(query);} + @Autowired + private OrganizationMapper organizationMapper; + @Override + public Integer addOrganization(Organization obj) { + return organizationMapper.addOrganization(obj); + } + + @Override + public void updateOrganization(Organization obj) { + organizationMapper.updateOrganization(obj); + } + + @Override + public void deleteOrganization(Integer id) { + organizationMapper.deleteOrganization(id); + } + + @Override + public Organization getOrganization(Integer id) { + return organizationMapper.getOrganization(id); + } + + @Override + public int queryOrganizationCount(OrganizationQuery query) { + return organizationMapper.queryOrganizationCount(query); + } + + @Override + public List queryOrganization(OrganizationQuery query) { + if (query.getNeed() != null) { + query.mysqlBuild(organizationMapper.queryOrganizationCount(query)); + } + return organizationMapper.queryOrganization(query); + } + + public List queryProvinceIdByOrgId(List orgId) { + return organizationMapper.queryProvinceIdByOrgId(orgId); + } } \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/Organization.xml b/platform-biz-service/src/main/resources/mainOrm/Organization.xml index ad2dfaa..a215f9f 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Organization.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Organization.xml @@ -209,5 +209,15 @@ select id,name,type,level,area_manage,province_id,city_id,area_id,address,descri + \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index 7e7abb3..e3eea50 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -402,12 +402,16 @@ public class OrganizationController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); List list = autoMatchFacade.matchOrgId(loginState.getId()); List a = new ArrayList<>(); - for (Integer integer : list) { + + if(CollectionUtils.isNotEmpty(list)){ + a = organizationService.queryProvinceIdByOrgId(list); + } + /* for (Integer integer : list) { Organization organization = organizationService.getOrganization(integer); if (null != organization) { a.add(organization.getProvinceId()); } - } + }*/ organizationQuery.setProvinceIds(a); }