shiyang / regional-platform

Download as
Browse Code »

Commit ebe8175a9146c5ddd65c0ebbb613ef017758267f

Authored by jiangjiazhi
1 parent 87bd72b39e
Exists in master and in 1 other branch nobuildprocess

增加1

Showing 5 changed files with 58 additions and 18 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/OrganizationMapper.java View file @ ebe8175
... ... @@ -18,5 +18,7 @@
18 18  
19 19 public List<Organization> queryOrganization(OrganizationQuery query);
20 20  
  21 + List<String> queryProvinceIdByOrgId(List<Integer> orgList);
  22 +
21 23 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java View file @ ebe8175
... ... @@ -18,5 +18,7 @@
18 18  
19 19 public List<Organization> queryOrganization(OrganizationQuery query);
20 20  
  21 + List<String> queryProvinceIdByOrgId(List<Integer> orgId);
  22 +
21 23 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java View file @ ebe8175
... ... @@ -7,27 +7,49 @@
7 7 import org.springframework.beans.factory.annotation.Autowired;
8 8 import org.springframework.stereotype.Service;
9 9  
10   -import java.util.Date;
11 10 import java.util.List;
12 11  
13 12 @Service
14 13 public class OrganizationServiceImpl implements OrganizationService {
15 14  
16   -@Autowired
17   -private OrganizationMapper organizationMapper;
  15 + @Autowired
  16 + private OrganizationMapper organizationMapper;
18 17  
19   -@Override
20   -public Integer addOrganization(Organization obj){ return organizationMapper.addOrganization(obj);}
21   -@Override
22   -public void updateOrganization(Organization obj){organizationMapper.updateOrganization(obj);}
23   -@Override
24   -public void deleteOrganization (Integer id){organizationMapper.deleteOrganization(id);}
25   -@Override
26   -public Organization getOrganization (Integer id){return organizationMapper.getOrganization(id);}
27   -@Override
28   -public int queryOrganizationCount (OrganizationQuery query){return organizationMapper.queryOrganizationCount(query);}
29   -@Override
30   -public List<Organization> queryOrganization (OrganizationQuery query){if (query.getNeed() != null) {query.mysqlBuild(organizationMapper.queryOrganizationCount(query));}return organizationMapper.queryOrganization(query);}
  18 + @Override
  19 + public Integer addOrganization(Organization obj) {
  20 + return organizationMapper.addOrganization(obj);
  21 + }
31 22  
  23 + @Override
  24 + public void updateOrganization(Organization obj) {
  25 + organizationMapper.updateOrganization(obj);
  26 + }
  27 +
  28 + @Override
  29 + public void deleteOrganization(Integer id) {
  30 + organizationMapper.deleteOrganization(id);
  31 + }
  32 +
  33 + @Override
  34 + public Organization getOrganization(Integer id) {
  35 + return organizationMapper.getOrganization(id);
  36 + }
  37 +
  38 + @Override
  39 + public int queryOrganizationCount(OrganizationQuery query) {
  40 + return organizationMapper.queryOrganizationCount(query);
  41 + }
  42 +
  43 + @Override
  44 + public List<Organization> queryOrganization(OrganizationQuery query) {
  45 + if (query.getNeed() != null) {
  46 + query.mysqlBuild(organizationMapper.queryOrganizationCount(query));
  47 + }
  48 + return organizationMapper.queryOrganization(query);
  49 + }
  50 +
  51 + public List<String> queryProvinceIdByOrgId(List<Integer> orgId) {
  52 + return organizationMapper.queryProvinceIdByOrgId(orgId);
  53 + }
32 54 }
platform-biz-service/src/main/resources/mainOrm/Organization.xml View file @ ebe8175
... ... @@ -209,6 +209,16 @@
209 209 <include refid="OrganizationCondition"/>
210 210 </select>
211 211  
  212 + <select id="queryProvinceIdByOrgId" parameterType="java.util.ArrayList" resultType="java.lang.String">
212 213  
  214 + SELECT DISTINCT province_id from organization where yn=1 and province_id is NOT null
  215 +
  216 + <if test="list != null and list.size() > 0">
  217 + and id in
  218 + <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
  219 + #{item}
  220 + </foreach>
  221 + </if>
  222 + </select>
213 223 </mapper>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ ebe8175
... ... @@ -402,12 +402,16 @@
402 402 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
403 403 List<Integer> list = autoMatchFacade.matchOrgId(loginState.getId());
404 404 List<String> a = new ArrayList<>();
405   - for (Integer integer : list) {
  405 +
  406 + if(CollectionUtils.isNotEmpty(list)){
  407 + a = organizationService.queryProvinceIdByOrgId(list);
  408 + }
  409 + /* for (Integer integer : list) {
406 410 Organization organization = organizationService.getOrganization(integer);
407 411 if (null != organization) {
408 412 a.add(organization.getProvinceId());
409 413 }
410   - }
  414 + }*/
411 415 organizationQuery.setProvinceIds(a);
412 416 }
413 417