Commit 3828f5438062dac6ea356d3ba4822c8feea7f0f0
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 3 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
View file @
3828f54
| ... | ... | @@ -57,6 +57,8 @@ |
| 57 | 57 | private String typeId; |
| 58 | 58 | @Value("#{configProperties['login.defaultPwd']}") |
| 59 | 59 | private String defaultPwd; |
| 60 | + @Value("#{configProperties[default_admin_org]}") | |
| 61 | + private Integer default_admin_org_id; | |
| 60 | 62 | @Autowired |
| 61 | 63 | private RolePermissionMapsService rolePermissionMapsService; |
| 62 | 64 | @Autowired |
| ... | ... | @@ -577,6 +579,7 @@ |
| 577 | 579 | Users users = new Users(); |
| 578 | 580 | users.setType(UserTypeEnum.PLATFORM_ADMIN.getId()); |
| 579 | 581 | users.setName(name); |
| 582 | + user.setOrgId(default_admin_org_id); | |
| 580 | 583 | users.setAccount(account); |
| 581 | 584 | users.setPhone(phone); |
| 582 | 585 | users.setEnable(enable); |
platform-operate-api/src/main/resources/database.properties
View file @
3828f54
platform-operate-api/src/main/webapp/WEB-INF/web.xml
View file @
3828f54
| ... | ... | @@ -13,7 +13,7 @@ |
| 13 | 13 | version="2.5" |
| 14 | 14 | xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> |
| 15 | 15 | |
| 16 | - <!-- | |
| 16 | +<!-- | |
| 17 | 17 | <filter> |
| 18 | 18 | <filter-name>CorsFilter</filter-name> |
| 19 | 19 | <filter-class>org.apache.catalina.filters.CorsFilter</filter-class> |
| ... | ... | @@ -47,7 +47,7 @@ |
| 47 | 47 | <url-pattern>/*</url-pattern> |
| 48 | 48 | </filter-mapping> |
| 49 | 49 | |
| 50 | - --> | |
| 50 | +--> | |
| 51 | 51 | <servlet-mapping> |
| 52 | 52 | <servlet-name>default</servlet-name> |
| 53 | 53 | <url-pattern>*.xml</url-pattern> |