diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java index 93a50a9..434a0ae 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java @@ -62,7 +62,7 @@ @RequestMapping(value = "/relateTenant") @ResponseBody public Object add(@RequestBody TenantDept tenantDept) { - tenantDeptService.save(tenantDept); + tenantDeptService.relateTenant(tenantDept); return ResponseData.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java index 93a50a9..434a0ae 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java @@ -62,7 +62,7 @@ @RequestMapping(value = "/relateTenant") @ResponseBody public Object add(@RequestBody TenantDept tenantDept) { - tenantDeptService.save(tenantDept); + tenantDeptService.relateTenant(tenantDept); return ResponseData.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ITenantDeptService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ITenantDeptService.java index 69a9e1c..540fb73 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ITenantDeptService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ITenantDeptService.java @@ -25,4 +25,10 @@ * @return 租户列表查询 */ List tenantList(QueryWrapper query); + + /** + * 绑定项目关系 + * @param tenantDept + */ + void relateTenant(TenantDept tenantDept); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java index 93a50a9..434a0ae 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java @@ -62,7 +62,7 @@ @RequestMapping(value = "/relateTenant") @ResponseBody public Object add(@RequestBody TenantDept tenantDept) { - tenantDeptService.save(tenantDept); + tenantDeptService.relateTenant(tenantDept); return ResponseData.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ITenantDeptService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ITenantDeptService.java index 69a9e1c..540fb73 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ITenantDeptService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ITenantDeptService.java @@ -25,4 +25,10 @@ * @return 租户列表查询 */ List tenantList(QueryWrapper query); + + /** + * 绑定项目关系 + * @param tenantDept + */ + void relateTenant(TenantDept tenantDept); } 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..4c9bd3a 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()); @@ -47,4 +48,12 @@ }).collect(Collectors.toList()); return dtos; } + + @Override + public void relateTenant(TenantDept tenantDept) { + QueryWrapper dtoQuery = new QueryWrapper<>(); + dtoQuery.eq("tenant_id",tenantDept.getTenantId()); + this.remove(dtoQuery); + this.save(tenantDept); + } }