Commit 0814b547ffa578bba11f26810671df7b1781e775
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
View file @
0814b54
... | ... | @@ -70,7 +70,7 @@ |
70 | 70 | Organization organization = null; |
71 | 71 | if (getStartUpModel()) { |
72 | 72 | OrganizationMapper masterOrganizationMapper = getSlaveMapper(); |
73 | - masterOrganizationMapper.getOrganization(id); | |
73 | + organization= masterOrganizationMapper.getOrganization(id); | |
74 | 74 | } else { |
75 | 75 | organization = masterOrganizationMapper.getOrganization(id); |
76 | 76 | } |
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RegionsServiceImpl.java
View file @
0814b54
... | ... | @@ -69,7 +69,7 @@ |
69 | 69 | if (getStartUpModel()) { |
70 | 70 | RegionsMapper masterPermissionsMapper = getslaveMapper(); |
71 | 71 | if (null != masterPermissionsMapper) { |
72 | - masterPermissionsMapper.getRegions(id); | |
72 | + return masterPermissionsMapper.getRegions(id); | |
73 | 73 | } |
74 | 74 | } |
75 | 75 | return masterRegionsMapper.getRegions(id); |