diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java index 28c59d0..5d7e339 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java @@ -38,6 +38,7 @@ TenantDTO dto = new TenantDTO(); BeanUtils.copyProperties(tenant, dto); QueryWrapper dtoQuery = new QueryWrapper<>(); + dtoQuery.eq("tenant_id",dto.getId()); TenantDept tenantDept = this.getOne(dtoQuery); if (tenantDept != null) { dto.setDeptId(tenantDept.getDeptId()); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java index 28c59d0..5d7e339 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java @@ -38,6 +38,7 @@ TenantDTO dto = new TenantDTO(); BeanUtils.copyProperties(tenant, dto); QueryWrapper dtoQuery = new QueryWrapper<>(); + dtoQuery.eq("tenant_id",dto.getId()); TenantDept tenantDept = this.getOne(dtoQuery); if (tenantDept != null) { dto.setDeptId(tenantDept.getDeptId()); diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml index 4dc3b0b..9b0985c 100644 --- a/casic-web/src/main/resources/config/application-postgre.yml +++ b/casic-web/src/main/resources/config/application-postgre.yml @@ -1,7 +1,10 @@ server: - port: 11309 + port: 11308 ################### spring配置 ################### spring: + web: + resources: + static-locations: file:/casic/smartwell/smartwellProd3/static/,file:/casic/smartwell/smartwellProd3/download/ # 文件的下载和图片路径,对应static接口 datasource: driver-class-name: org.postgresql.Driver url: jdbc:postgresql://111.198.10.15:11209/smartwell @@ -28,21 +31,20 @@ broker-url: tcp://192.168.0.203:61616 #flowable数据源和多数据源配置 casic: - kaptcha-open: false #是否开启登录时验证码 (true/false) - #kaptcha-open: false #是否开启登录时验证码 (true/false) + kaptcha-open: false #是否开启登录时验证�?(true/false) + #kaptcha-open: false #是否开启登录时验证�?(true/false) no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken db: init: enable: false - file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload + file-upload-path: /casic/smartwell/smartwellProd3/upload spring-session-open: false #开启spring session + urlExclusion: /well/update,/well/add smartcity: config: - export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ - #export-path: D:\export\ - image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\ - config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\ - download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\ + export-path: /casic/smartwell/smartwellProd3P/export/ + image-path: /casic/smartwell/smartwellProd3P/static/ #图片下载上传路径 + config-path: //casic/smartwell/smartwellProd3P/temp/ #模板路径,注意linux下要多加一个斜�? download-path: /casic/smartwell/smartwellProd3P/download/ #下载路径 device: redis: invalid-time: 86400 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java index 28c59d0..5d7e339 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java @@ -38,6 +38,7 @@ TenantDTO dto = new TenantDTO(); BeanUtils.copyProperties(tenant, dto); QueryWrapper dtoQuery = new QueryWrapper<>(); + dtoQuery.eq("tenant_id",dto.getId()); TenantDept tenantDept = this.getOne(dtoQuery); if (tenantDept != null) { dto.setDeptId(tenantDept.getDeptId()); diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml index 4dc3b0b..9b0985c 100644 --- a/casic-web/src/main/resources/config/application-postgre.yml +++ b/casic-web/src/main/resources/config/application-postgre.yml @@ -1,7 +1,10 @@ server: - port: 11309 + port: 11308 ################### spring配置 ################### spring: + web: + resources: + static-locations: file:/casic/smartwell/smartwellProd3/static/,file:/casic/smartwell/smartwellProd3/download/ # 文件的下载和图片路径,对应static接口 datasource: driver-class-name: org.postgresql.Driver url: jdbc:postgresql://111.198.10.15:11209/smartwell @@ -28,21 +31,20 @@ broker-url: tcp://192.168.0.203:61616 #flowable数据源和多数据源配置 casic: - kaptcha-open: false #是否开启登录时验证码 (true/false) - #kaptcha-open: false #是否开启登录时验证码 (true/false) + kaptcha-open: false #是否开启登录时验证�?(true/false) + #kaptcha-open: false #是否开启登录时验证�?(true/false) no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken db: init: enable: false - file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload + file-upload-path: /casic/smartwell/smartwellProd3/upload spring-session-open: false #开启spring session + urlExclusion: /well/update,/well/add smartcity: config: - export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ - #export-path: D:\export\ - image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\ - config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\ - download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\ + export-path: /casic/smartwell/smartwellProd3P/export/ + image-path: /casic/smartwell/smartwellProd3P/static/ #图片下载上传路径 + config-path: //casic/smartwell/smartwellProd3P/temp/ #模板路径,注意linux下要多加一个斜�? download-path: /casic/smartwell/smartwellProd3P/download/ #下载路径 device: redis: invalid-time: 86400 diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index ce704d7..880d26f 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: postgre + active: dev servlet: multipart: max-file-size: 50MB