diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/notice/controller/app/ApiBaseNoticeController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/notice/controller/app/ApiBaseNoticeController.java
index e2dfa4d8..b6f57b1d 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/notice/controller/app/ApiBaseNoticeController.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/notice/controller/app/ApiBaseNoticeController.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.notice.controller.app;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import cn.iocoder.yudao.module.notice.entity.DlBaseNotice;
import cn.iocoder.yudao.module.notice.service.DlBaseNoticeService;
import cn.iocoder.yudao.module.notice.vo.DlBaseNoticeReqVO;
@@ -50,5 +51,15 @@ public class ApiBaseNoticeController {
return success(dlBaseNoticeService.pageNotice(reqVO, page));
}
+ /**
+ * 小程序根据id查询公告详情
+ */
+ @GetMapping("/get")
+ @Operation(summary = "平台通用信息公告 查询 按服务")
+ @TenantIgnore
+ public CommonResult> getNoticeById(@RequestParam("id") String id) {
+ return success(dlBaseNoticeService.getById(id));
+ }
+
}
diff --git a/dl-module-base/src/main/resources/mapper/company/CompanyMapper.xml b/dl-module-base/src/main/resources/mapper/company/CompanyMapper.xml
index 1a66457e..5969c654 100644
--- a/dl-module-base/src/main/resources/mapper/company/CompanyMapper.xml
+++ b/dl-module-base/src/main/resources/mapper/company/CompanyMapper.xml
@@ -50,5 +50,8 @@
from base_company bc
left join system_tenant st on bc.tenant_id = st.id
where FIND_IN_SET(#{map.serviceCodes}, bc.service_codes) > 0
+
+ and bc.tenant_id = #{map.tenantId}
+
-
\ No newline at end of file
+
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/controller/app/ApiAppLoginController.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/controller/app/ApiAppLoginController.java
index b8f63318..daca360a 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/controller/app/ApiAppLoginController.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/controller/app/ApiAppLoginController.java
@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.security.PermitAll;
+
/**
* 员工APP端登录通用接口
* @author vinjor-M
@@ -49,5 +51,4 @@ public class ApiAppLoginController {
public CommonResult> getMyAdviser(Long tenantId,String sysCode) {
return CommonResult.success(companyStaffService.getMyAdviser(tenantId,sysCode));
}
-
}
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/CompanyStaffService.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/CompanyStaffService.java
index e9628772..267f31dd 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/CompanyStaffService.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/CompanyStaffService.java
@@ -143,8 +143,8 @@ public interface CompanyStaffService extends IService {
/**
* 客户查我的邀请人
- * @author vinjor-M
- * @date 10:49 2024/11/6
+ * @author vinjor-M
+ * @date 10:49 2024/11/6
* @return cn.iocoder.yudao.module.staff.entity.CompanyStaff
**/
CompanyStaffRespVO getMyAdviser(Long tenantId,String sysCode);
diff --git a/dl-module-company/src/main/resources/mapper/staff/CompanyStaffMapper.xml b/dl-module-company/src/main/resources/mapper/staff/CompanyStaffMapper.xml
index 4c129cb6..1f65c2ba 100644
--- a/dl-module-company/src/main/resources/mapper/staff/CompanyStaffMapper.xml
+++ b/dl-module-company/src/main/resources/mapper/staff/CompanyStaffMapper.xml
@@ -115,4 +115,4 @@
AND bcm.tenant_id = #{tenantId}
LIMIT 1
-
\ No newline at end of file
+
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCoachController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCoachController.java
index 28a78827..9f1db9ad 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCoachController.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCoachController.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.base.controller.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoach;
import cn.iocoder.yudao.module.base.service.DlDriveSchoolCoachService;
import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCoachPageReqVO;
@@ -16,6 +17,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
import javax.validation.Valid;
import java.util.List;
@@ -139,6 +141,4 @@ public class DlDriveSchoolCoachController {
public CommonResult> getCoachByUserId(@RequestParam("userId") Long userId) {
return success(dlDriveSchoolCoachService.getDlDriveSchoolCoachByUserId(userId));
}
-
-
-}
\ No newline at end of file
+}
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolCoachSmallProgramController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolCoachSmallProgramController.java
index 9de4b026..60fde4ca 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolCoachSmallProgramController.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolCoachSmallProgramController.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.base.controller.app;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.jx.core.controller.BaseController;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoach;
@@ -34,7 +35,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@RestController
@RequestMapping("/dl-drive-school-coach-small")
@Validated
-public class DlDriveSchoolCoachSmallProgramController {
+public class DlDriveSchoolCoachSmallProgramController extends BaseController{
@Resource
private DlDriveSchoolCoachService dlDriveSchoolCoachService;
@@ -87,8 +88,8 @@ public class DlDriveSchoolCoachSmallProgramController {
**/
@GetMapping("/queryCoachByCourseId")
@TenantIgnore
- public List queryByCourseId(String courseId) {
- return coachCourseService.queryByCourseId(courseId);
+ public CommonResult> queryByCourseId(String courseId) {
+ return success(coachCourseService.queryByCourseId(courseId));
}
@@ -123,4 +124,11 @@ public class DlDriveSchoolCoachSmallProgramController {
DlDriveSchoolCoach dlDriveSchoolCoach = dlDriveSchoolCoachService.getDlDriveSchoolCoach(id);
return success(BeanUtils.toBean(dlDriveSchoolCoach, DlDriveSchoolCoachRespVO.class));
}
+
+ @GetMapping("/getCoachByUniqueCode")
+ @TenantIgnore
+ @PermitAll
+ public CommonResult> getCoachByUniqueCode(@RequestParam("uniqueCode") String uniqueCode) {
+ return success(dlDriveSchoolCoachService.getCoachByUniqueCode(uniqueCode));
+ }
}
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolCoachMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolCoachMapper.java
index 099e8287..47c4c432 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolCoachMapper.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolCoachMapper.java
@@ -39,4 +39,9 @@ public interface DlDriveSchoolCoachMapper extends BaseMapper
* @date 13:53 2025/2/6
**/
IPage pageStaffCoach(@Param("entity") DlDriveSchoolStaffVO entity, Page page);
-}
\ No newline at end of file
+
+ /**
+ * 根据邀请码查询教练信息
+ */
+ DlDriveSchoolCoach getCoachByUniqueCode(@Param("uniqueCode") String uniqueCode);
+}
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCoachService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCoachService.java
index 0e2d5a2f..aae9d385 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCoachService.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCoachService.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.base.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
import javax.validation.Valid;
import java.util.List;
@@ -99,5 +100,10 @@ public interface DlDriveSchoolCoachService extends IService
**/
CoachInfoVO getCoachById(String id);
+ /**
+ * 根据邀请码查询教练信息
+ */
+ DlDriveSchoolCoach getCoachByUniqueCode(String uniqueCode);
+
}
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCoachServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCoachServiceImpl.java
index 9ef94c37..f7e86262 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCoachServiceImpl.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCoachServiceImpl.java
@@ -418,5 +418,13 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl
+
+