diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 1e8e7e6b9467a6918f81fdf31796ce20158b6f4c..55c86b1105841868e6efc0de2570e3e6afc28ac6 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -25,7 +25,9 @@ import javax.servlet.http.HttpServletResponse; import java.sql.Timestamp; import java.time.LocalDate; import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; @Slf4j @RequestMapping("/api/basic") diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java index 8a3d4a4613f5531d57cd858235f7dc5592148c7f..82864993e6e4e3ef15271b94f5163d5f82fc5514 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -13,7 +13,6 @@ import com.pms.ocp.model.dto.GroupDto; import com.pms.ocp.model.dto.OcpTenantBaseDto; import com.pms.ocp.model.dto.TenantDto; import com.pms.ocp.model.entity.*; - import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.TenantGroupVo; import com.pms.ocp.service.*; @@ -21,8 +20,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import java.sql.Timestamp; import java.time.LocalDateTime; import java.util.ArrayList;