fangcheng / regional-platform

Download as
Browse Code »

Commit 430b20d8597b51a0b10b5b30b48b1b04e3e13046

Authored by zhangrui
1 parent 5c48b839dd
Exists in master and in 1 other branch nobuildprocess

bug fix

Showing 1 changed file with 18 additions and 10 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java View file @ 430b20d
... ... @@ -37,13 +37,16 @@
37 37 public Organization getOrganization(Integer id) {
38 38 Organization organization = organizationMapper.getOrganization(id);
39 39 if(null != organization) {
40   - //锟斤拷锟矫伙拷锟斤拷锟斤拷锟斤拷 0 锟斤拷司 1 医院
41   - if( null != organization.getType() &&
42   - (organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) ||
  40 + //设置机构类型 1 医院 0 公司
  41 + if( null != organization.getType()) {
  42 + if((organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) ||
43 43 organization.getType().equals(OrganizationTypeEnum.TY.getId())|| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) {
44   - organization.setOrgType(1);
  44 + organization.setOrgType(1);
  45 + } else {
  46 + organization.setOrgType(0);
  47 + }
45 48 } else {
46   - organization.setOrgType(0);
  49 + organization.setOrgType(null);
47 50 }
48 51 }
49 52 return organization;
50 53  
51 54  
... ... @@ -63,13 +66,18 @@
63 66 if(CollectionUtils.isNotEmpty(organizations)) {
64 67 for(Organization organization : organizations) {
65 68 if(null != organization) {
66   - if( null != organization.getType() &&
67   - (organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) ||
68   - organization.getType().equals(OrganizationTypeEnum.TY.getId())|| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) {
69   - organization.setOrgType(1);
  69 + //设置机构类型 1 医院 0 公司
  70 + if( null != organization.getType() ) {
  71 + if((organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) ||
  72 + organization.getType().equals(OrganizationTypeEnum.TY.getId())|| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) {
  73 + organization.setOrgType(1);
  74 + } else {
  75 + organization.setOrgType(0);
  76 + }
70 77 } else {
71   - organization.setOrgType(0);
  78 + organization.setOrgType(null);
72 79 }
  80 +
73 81 }
74 82 }
75 83 }