Merge remote-tracking branch 'origin/master'

national-motion-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -100,9 +100,10 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/auth/2step-code", "anon");//登录验证码
         filterChainDefinitionMap.put("/sys/common/static/**", "anon");//图片预览 &下载文件不限制token
         filterChainDefinitionMap.put("/sys/common/pdf/**", "anon");//pdf预览
-        filterChainDefinitionMap.put("/app/home/**", "anon");//APP首页接口
+        filterChainDefinitionMap.put("/app/home/homeInfo", "anon");//APP首页接口
+        filterChainDefinitionMap.put("/app/home/getMsg", "anon");//APP首页接口
 
-        filterChainDefinitionMap.put("/app/user/**", "anon");//小程序相关
+//        filterChainDefinitionMap.put("/app/user/**", "anon");//小程序相关
 
         //filterChainDefinitionMap.put("/sys/common/view/**", "anon");//图片预览不限制token
         //filterChainDefinitionMap.put("/sys/common/download/**", "anon");//文件下载不限制token

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/AppHomeController.java

@@ -120,7 +120,20 @@ public class AppHomeController {
      **/
     @GetMapping("/getCourseInfo")
     @Operation(summary = "课程详情")
-    public Result<CourseInfoVO> getCourseInfo(@Schema(description="课程ID")String id, double latitude, double longitude){
+    public Result<CourseInfoVO> getCourseInfo(@RequestParam @Schema(description="课程ID")String id, @RequestParam double latitude,@RequestParam double longitude){
         return Result.ok(detailService.getCourseInfo(id, latitude, longitude));
     }
+
+    /**
+     * @Author SheepHy
+     * @Description 根据课程类型查询课程列表
+     * @Date 9:52 2025/7/9
+     * @Param type 课程类型
+     * @return List<PlaceInfoVO.CourseInfoVO>
+     **/
+    @GetMapping("/courseInfoVOList")
+    @Operation(summary = "根据课程类型查询课程列表")
+    public Result<List<PlaceInfoVO.CourseInfoVO>> courseInfoVOList(@RequestParam @Schema(description="课程类型")String type, @RequestParam @Schema(description="课程ID")String id){
+        return Result.ok(detailService.courseInfoVOList(type, id));
+    }
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/my/AppEvaluateController.java

@@ -50,6 +50,7 @@ public class AppEvaluateController {
     @PostMapping("/submitFeedback")
     @Operation(summary = "提交评价")
     public Result<String> submitFeedback(@RequestBody AddEvaluateDTO addEvaluateDTO) {
+        //缺少订单校验逻辑 需要校验订单并且
         Evaluate evaluate = new Evaluate();
         LoginUser principal = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         BeanUtils.copyProperties(addEvaluateDTO, evaluate);

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/IDetailService.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.app.service;
 import org.jeecg.modules.app.vo.CourseInfoVO;
 import org.jeecg.modules.app.vo.PlaceInfoVO;
 
+import java.util.List;
+
 public interface IDetailService {
     /**
      * @Author SheepHy
@@ -21,4 +23,21 @@ public interface IDetailService {
      * @return CourseInfoVO {@link CourseInfoVO}
      **/
     CourseInfoVO getCourseInfo(String id, double latitude, double longitude);
+
+    /**
+     * @Author SheepHy
+     * @Description 根据课程类型查询课程列表
+     * @Date 9:52 2025/7/9
+     * @Param type 课程类型
+     * @return List<PlaceInfoVO.CourseInfoVO>
+     **/
+    List<PlaceInfoVO.CourseInfoVO> courseInfoVOList(String type, String id);
+    
+    /** 
+     * @Author SheepHy
+     * @Description //TODO 
+     * @Date 10:14 2025/7/9
+     * @Param 
+     * @return 
+     **/
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/AppHomeServiceImpl.java

@@ -87,11 +87,16 @@ public class AppHomeServiceImpl implements IAppHomeService {
                     Wrappers.<AppInstructor>lambdaQuery().eq(AppInstructor::getUserId, userId));
 
             InstructorVO instructorVO = new InstructorVO();
-            BeanUtils.copyProperties(instructorVO, appInstructor);
-
+            BeanUtils.copyProperties(appInstructor,instructorVO);
+            List<String> list = new ArrayList<>();
+                    List.of(appInstructor.getTrainingPrograms().split(",")).forEach(item -> {
+                        String str = appCategoryMapper.selectById(item).getName();
+                        list.add(str);
+                    });
             instructorVO.setId(sysUser.getId())
                     .setAvatar(sysUser.getAvatar())
-                    .setName(sysUser.getRealname())
+                    .setName(sysUser.getRealname()).setList(list)
+                    .setTeachingCount(appInstructor.getClassesNumber())
                     .setOrgName(sysDepartMapper.selectOne(Wrappers.<SysDepart>lambdaQuery()
                             .eq(SysDepart::getOrgCode, sysUser.getOrgCode())).getDepartName());
 
@@ -102,7 +107,10 @@ public class AppHomeServiceImpl implements IAppHomeService {
             List<InstructorVO.CourseInfoVO> courseInfoVOS = courses.stream()
                     .map(course -> {
                         InstructorVO.CourseInfoVO vo = new InstructorVO.CourseInfoVO();
-                        BeanUtils.copyProperties(vo, course);
+                        BeanUtils.copyProperties(course,vo);
+                        //todo 教练订单统计
+                        vo.setCount(6666);
+                        vo.setSellingPrice(course.getSellingPrice());
                         return vo;
                     })
                     .collect(Collectors.toList());
@@ -129,7 +137,7 @@ public class AppHomeServiceImpl implements IAppHomeService {
      * @Description 合并课程信息
      * @Date 9:14 2025/7/4
      * @Param appCoureseList {@link List<AppCourses>}
-     * @return List<CoureseVO> {@link List< CourseVO >}
+     * @return List<CoureseVO> {@link List<CourseVO>}
      **/
     private List<CourseVO> convertToCoureseVOList(List<AppCourses> appCoureseList) {
         return appCoureseList.stream()

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/DetailServiceImpl.java

@@ -40,7 +40,6 @@ public class DetailServiceImpl implements IDetailService {
 
     @Override
     public PlaceInfoVO getPlaceInfo(String id) {
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         AppSite appSite = appSiteMapper.selectById(id);
         PlaceInfoVO placeInfo = appSiteMapper.getPlaceInfo(id);
         AppSitePriceRules appSitePriceRules = appSitePriceRulesMapper.selectOne(Wrappers.<AppSitePriceRules>lambdaQuery()
@@ -57,22 +56,8 @@ public class DetailServiceImpl implements IDetailService {
                 instructorVOList.add(vo);
             }
         }
-        List<PlaceInfoVO.CourseInfoVO> courseInfoVOList = new ArrayList<>();
-        appCoursesMapper.selectList(Wrappers.<AppCourses>lambdaQuery()
-                .eq(AppCourses::getSiteId, id)
-                .eq(AppCourses::getStatus, 0)
-                .eq(AppCourses::getDelFlag, 0)).forEach(appCourses -> {
-                PlaceInfoVO.CourseInfoVO courseInfoVO = new PlaceInfoVO.CourseInfoVO();
-                    BeanUtils.copyProperties(courseInfoVO, appCourses);
-                    courseInfoVO.setSales(getCourseSalesCount(appCourses.getId()));
-                    courseInfoVO.setSalesYear(getCourseSales(appCourses.getId()));
-                    courseInfoVO.setPriceType(isFirstPurchase(user.getId()));
-            courseInfoVOList.add(courseInfoVO);
-        });
         placeInfo.setInstructorVOList(instructorVOList);
-        placeInfo.setCourseInfoVOList(courseInfoVOList);
         if(appSite.getType() == 0){
-            //todo 评价查询待添加
             PlaceInfoVO.PlaceInfoMsgVO placeInfoMsgVO = new PlaceInfoVO.PlaceInfoMsgVO();
             placeInfoMsgVO.setName(appSite.getName())
                     .setSales(getPlaceSales(id))
@@ -81,7 +66,6 @@ public class DetailServiceImpl implements IDetailService {
             placeInfo.setPlaceInfoMsgVO(placeInfoMsgVO);
             return placeInfo;
         }else if(appSite.getType() == 1){
-//            //todo 评价查询待添加
             PlaceInfoVO.PlaceInfoMsgVO placeInfoMsgVO = new PlaceInfoVO.PlaceInfoMsgVO();
             placeInfoMsgVO.setName(appSite.getName())
                     .setSales(getPlaceSales(id))
@@ -109,10 +93,27 @@ public class DetailServiceImpl implements IDetailService {
             courseDetailVOList.add(courseDetailVO);
         });
         courseInfoVO.setCourseDetail(courseDetailVOList);
-        //todo 评价查询待添加
         return courseInfoVO;
     }
 
+    @Override
+    public List<PlaceInfoVO.CourseInfoVO> courseInfoVOList(String type, String id) {
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        List<PlaceInfoVO.CourseInfoVO> courseInfoVOList = new ArrayList<>();
+        appCoursesMapper.selectList(Wrappers.<AppCourses>lambdaQuery()
+                .eq(AppCourses::getSiteId, id)
+                .eq(AppCourses::getStatus, 0)
+                .eq(AppCourses::getDelFlag, 0)).forEach(appCourses -> {
+            PlaceInfoVO.CourseInfoVO courseInfoVO = new PlaceInfoVO.CourseInfoVO();
+            BeanUtils.copyProperties(courseInfoVO, appCourses);
+            courseInfoVO.setSales(getCourseSalesCount(appCourses.getId()));
+            courseInfoVO.setSalesYear(getCourseSales(appCourses.getId()));
+            courseInfoVO.setPriceType(isFirstPurchase(user.getId()));
+            courseInfoVOList.add(courseInfoVO);
+        });
+        return courseInfoVOList;
+    }
+
     /**
      * @return
      * @Author SheepHy
@@ -148,6 +149,9 @@ public class DetailServiceImpl implements IDetailService {
         return Math.toIntExact(appOrderProductMapper.selectCount(
                 Wrappers.<AppOrderProduct>lambdaQuery()
                         .eq(AppOrderProduct::getProductId, id)
+                        .eq(AppOrderProduct::getStatus,0)
+                        .eq(AppOrderProduct::getDelFlag,0)
+                        .eq(AppOrderProduct::getProductOrderStatus,1)
                         .ge(AppOrderProduct::getCreateTime, Date.from(startOfYear.atZone(ZoneId.systemDefault()).toInstant())) // >= 2025-01-01
                         .lt(AppOrderProduct::getCreateTime, Date.from(endOfYear.atZone(ZoneId.systemDefault()).toInstant())) // < 2026-01-01
         ));
@@ -175,7 +179,8 @@ public class DetailServiceImpl implements IDetailService {
      * @return
      **/
     private int isFirstPurchase(String userId) {
-        AppOrder appOrder = appOrderMapper.selectOne(Wrappers.<AppOrder>lambdaQuery().eq(AppOrder::getUpdateBy, userId).last("limit 1"));
+        AppOrder appOrder = appOrderMapper.selectOne(Wrappers.<AppOrder>lambdaQuery()
+                .eq(AppOrder::getUpdateBy, userId).last("limit 1"));
         if(null == appOrder){
             return 1;
         }else {

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/UserServiceImpl.java

@@ -93,16 +93,19 @@ public class UserServiceImpl implements IUserService {
     public List<MsgVO> getMsg() {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         List<MsgVO> msgVOList = new ArrayList<>();
-        sysAnnouncementSendMapper.selectList(Wrappers.<SysAnnouncementSend>lambdaQuery()
-                .eq(SysAnnouncementSend::getUserId, user.getId())).forEach(sysAnnouncementSend -> {
-            SysAnnouncement sysAnnouncement = sysAnnouncementMapper.selectById(sysAnnouncementSend.getAnntId());
-            MsgVO msgVO = new MsgVO()
-                    .setReadFlag(sysAnnouncementSend.getReadFlag())
-                    .setTitile(sysAnnouncement.getTitile())
-                    .setSendTime(sysAnnouncement.getSendTime())
-                    .setImgUrl(sysAnnouncement.getImgUrl()).setSender(sysAnnouncement.getSender());
-            msgVOList.add(msgVO);
-        });
+        if(null != user){
+            sysAnnouncementSendMapper.selectList(Wrappers.<SysAnnouncementSend>lambdaQuery()
+                    .eq(SysAnnouncementSend::getUserId, user.getId())).forEach(sysAnnouncementSend -> {
+                SysAnnouncement sysAnnouncement = sysAnnouncementMapper.selectById(sysAnnouncementSend.getAnntId());
+                MsgVO msgVO = new MsgVO()
+                        .setReadFlag(sysAnnouncementSend.getReadFlag())
+                        .setTitile(sysAnnouncement.getTitile())
+                        .setSendTime(sysAnnouncement.getSendTime())
+                        .setImgUrl(sysAnnouncement.getImgUrl()).setSender(sysAnnouncement.getSender());
+                msgVOList.add(msgVO);
+            });
+            return msgVOList;
+        }
         return msgVOList;
     }
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/InstructorVO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -23,13 +24,16 @@ public class InstructorVO {
     @Schema(description = "教学理念")
     private String teachingPhilosophy;
     @Schema(description = "好评率")
-    private String goodRate;
+    private BigDecimal goodRate;
     @Schema(description = "订单数")
     private String orderCount;
     @Schema(description = "授课人数")
-    private String teachingCount;
+    private Integer teachingCount;
     @Schema(description = "擅长说明")
     private String excelMsg;
+    @Schema(description = "培训项目")
+    private String trainingPrograms;
+    private List<String> list;
     @Schema(description = "课程列表")
     private List<CourseInfoVO> courseList;
 
@@ -43,11 +47,13 @@ public class InstructorVO {
         @Schema(description = "课程名称")
         private String name;
         @Schema(description = "课程价格")
-        private String sellingPrice;
+        private BigDecimal sellingPrice;
         @Schema(description = "课程类型")
         private String type;
         @Schema(description = "课程简介")
         private String intro;
+        @Schema(description = "课程数量")
+        private int count;
     }
 
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/PlaceInfoVO.java

@@ -43,12 +43,10 @@ public class PlaceInfoVO {
     private Object placeInfoMsgVO;
     @Schema(description = "教练简约返回参数")
     private List<InstructorVO> instructorVOList;
-    @Schema(description="课程返回参数")
-    private List<CourseInfoVO> courseInfoVOList;
     @Data
     @Accessors(chain = true)
     @EqualsAndHashCode(callSuper = false)
-    @Schema(description="场地简约返回参数")
+    @Schema(description="场地简约返回参数-学校")
     public static class PlaceInfoMsgVO{
         @Schema(description = "场地名称")
         private String name;
@@ -61,6 +59,22 @@ public class PlaceInfoVO {
         @Schema(description = "售价")
         private BigDecimal sellingPrice;
     }
+//    @Data
+//    @Accessors(chain = true)
+//    @EqualsAndHashCode(callSuper = false)
+//    @Schema(description="场地简约返回参数-体育馆")
+//    public static class PlaceInfoMsgVO{
+//        @Schema(description = "场地名称")
+//        private String name;
+//        @Schema(description = "销售数量")
+//        private int sales;
+//        @Schema(description = "类目")
+//        private List<String> category;
+//        @Schema(description = "原价")
+//        private BigDecimal originalPrice;
+//        @Schema(description = "售价")
+//        private BigDecimal sellingPrice;
+//    }
     @Data
     @Accessors(chain = true)
     @EqualsAndHashCode(callSuper = false)

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppBannerController.java

@@ -0,0 +1,159 @@
+package org.jeecg.modules.system.app.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.system.app.entity.AppBanner;
+import org.jeecg.modules.system.app.service.IAppBannerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: 首页轮播图管理
+ * @Author: jeecg-boot
+ * @Date:   2023-08-14
+ * @Version: V1.0
+ */
+@Tag(name="首页轮播图管理")
+@RestController
+@RequestMapping("/app/appBanner")
+@Slf4j
+public class AppBannerController extends JeecgController<AppBanner, IAppBannerService> {
+	@Autowired
+	private IAppBannerService appBannerService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param appBanner
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "首页轮播图管理-分页列表查询")
+	@Operation(summary="首页轮播图管理-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<AppBanner>> queryPageList(AppBanner appBanner,
+													@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													HttpServletRequest req) {
+		QueryWrapper<AppBanner> queryWrapper = QueryGenerator.initQueryWrapper(appBanner, req.getParameterMap());
+		Page<AppBanner> page = new Page<AppBanner>(pageNo, pageSize);
+		IPage<AppBanner> pageList = appBannerService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param appBanner
+	 * @return
+	 */
+	@AutoLog(value = "首页轮播图管理-添加")
+	@Operation(summary="首页轮播图管理-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody AppBanner appBanner) {
+		appBanner.setDelFlag(CommonConstant.DEL_FLAG_0);
+		appBannerService.save(appBanner);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param appBanner
+	 * @return
+	 */
+	@AutoLog(value = "首页轮播图管理-编辑")
+	@Operation(summary="首页轮播图管理-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody AppBanner appBanner) {
+		appBannerService.updateById(appBanner);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "首页轮播图管理-通过id删除")
+	@Operation(summary="首页轮播图管理-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		appBannerService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "首页轮播图管理-批量删除")
+	@Operation(summary="首页轮播图管理-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.appBannerService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "首页轮播图管理-通过id查询")
+	@Operation(summary="首页轮播图管理-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<AppBanner> queryById(@RequestParam(name="id",required=true) String id) {
+		AppBanner appBanner = appBannerService.getById(id);
+		if(appBanner==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(appBanner);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param appBanner
+    */
+    @RequiresPermissions("app:app_banner:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, AppBanner appBanner) {
+        return super.exportXls(request, appBanner, AppBanner.class, "首页轮播图管理");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("app:app_banner:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, AppBanner.class);
+    }
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/EvaluateMapper.xml

@@ -4,9 +4,9 @@
 
     <select id="findPage" resultType="org.jeecg.modules.system.app.dto.evaluate.FindEvaluateResponseDTO">
         select
-            ne.score,ne.evaluate_content,ne.avatar,ne.images,ne.check_status,ne.reply_status,ne.reply_content,ne.reply_time,ne.type,ne.create_time,sd.depart_name,ns.address,su.username,su.phone
+            ne.score,ne.evaluate_content,su.avatar,ne.images,ne.check_status,ne.reply_status,ne.reply_content,ne.reply_time,ne.type,ne.create_time,sd.depart_name,ns.address,su.username,su.phone
         from nm_evaluate ne
-        left join  sys_depart sd on  ne.dept_id = s.id
+        left join  sys_depart sd on  ne.dept_id = sd.id
         LEFT JOIN nm_site ns on  ne.site_id =ns.id
         LEFT JOIN sys_user su on  ne.user_id =su.id
         where 1=1
@@ -15,7 +15,7 @@
                 and ne.org_code like CONCAT('',#{findEvaluateRequestDTO.orgCode},'%')
             </if>
         <if test="findEvaluateRequestDTO.deptId!=null and findEvaluateRequestDTO.deptId!=''">
-            AND ne.score = #{findEvaluateRequestDTO.deptId}
+            AND ne.deptId = #{findEvaluateRequestDTO.deptId}
         </if>
         <if test="findEvaluateRequestDTO.score!=null">
             AND ne.score = #{findEvaluateRequestDTO.score}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IAppBannerService.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.system.app.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.app.entity.AppBanner;
+
+/**
+ * @Description: 首页轮播图管理
+ * @Author: jeecg-boot
+ * @Date:   2023-08-14
+ * @Version: V1.0
+ */
+public interface IAppBannerService extends IService<AppBanner> {
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppBannerServiceImpl.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.system.app.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.system.app.entity.AppBanner;
+import org.jeecg.modules.system.app.mapper.AppBannerMapper;
+import org.jeecg.modules.system.app.service.IAppBannerService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 首页轮播图管理
+ * @Author: jeecg-boot
+ * @Date: 2023-08-14
+ * @Version: V1.0
+ */
+@Service
+public class AppBannerServiceImpl extends ServiceImpl<AppBannerMapper, AppBanner> implements IAppBannerService {
+
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -300,7 +300,7 @@
 	</select>
 
 	<select id="getUserIdListByRoleId" resultType="string" parameterType="string">
-		SELECT b.id FROM `sys_role` a LEFT JOIN sys_user_role b ON a.id = b.role_id
+		SELECT b.user_id FROM `sys_role` a LEFT JOIN sys_user_role b ON a.id = b.role_id
 		WHERE a.role_code = #{roleCode}
 	</select>
     <select id="findPage" resultType="org.jeecg.modules.system.app.dto.FindPageCUserInfoResponseDTO">