浏览代码

fix: 招聘会接口调整

zhangying 2 天之前
父节点
当前提交
82c3de05d3

+ 27 - 1
jeecg-boot/jeecg-boot-module/jeecg-module-zjrs/src/main/java/org/jeecg/modules/zjrs/recruitmentfair/controller/RecruitmentFairController.java

@@ -128,8 +128,16 @@ public class RecruitmentFairController extends JeecgController<RecruitmentFair,
                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                         HttpServletRequest req) {
         // 使用 QueryGenerator 以确保与管理端查询逻辑一致(支持所有过滤参数、数据权限等)
+        // 先取出 fairName,清空后传给 QueryGenerator,避免其自动添加等值查询
+        String fairName = recruitmentFair.getFairName();
+        recruitmentFair.setFairName(null);
         QueryWrapper<RecruitmentFair> queryWrapper = QueryGenerator.initQueryWrapper(recruitmentFair, req.getParameterMap());
         
+        // 手动添加模糊查询条件
+        if (org.jeecg.common.util.oConvertUtils.isNotEmpty(fairName)) {
+            queryWrapper.like("fair_name", fairName);
+        }
+        
         // 如果没有显式指定排序字段,则默认按创建时间倒序排列
         if (org.jeecg.common.util.oConvertUtils.isEmpty(req.getParameter("column"))) {
             queryWrapper.orderByDesc("create_time");
@@ -300,7 +308,16 @@ public class RecruitmentFairController extends JeecgController<RecruitmentFair,
         java.util.List<String> fairIds = entList.stream().map(RecruitmentFairEnterprise::getFairId).collect(java.util.stream.Collectors.toList());
         
         // 查询招聘会列表,使用 QueryGenerator 以支持过滤
+        // 先取出 fairName,清空后传给 QueryGenerator,避免其自动添加等值查询
+        String fairName = recruitmentFair.getFairName();
+        recruitmentFair.setFairName(null);
         QueryWrapper<RecruitmentFair> queryWrapper = QueryGenerator.initQueryWrapper(recruitmentFair, req.getParameterMap());
+        
+        // 手动添加模糊查询条件
+        if (org.jeecg.common.util.oConvertUtils.isNotEmpty(fairName)) {
+            queryWrapper.like("fair_name", fairName);
+        }
+        
         queryWrapper.in("id", fairIds);
         if (org.jeecg.common.util.oConvertUtils.isEmpty(req.getParameter("column"))) {
             queryWrapper.orderByDesc("create_time");
@@ -331,8 +348,17 @@ public class RecruitmentFairController extends JeecgController<RecruitmentFair,
         }
         java.util.List<String> fairIds = perList.stream().map(RecruitmentFairPersonal::getFairId).collect(java.util.stream.Collectors.toList());
         
-        // 查询招聘会列表
+        // 查询招聘会列表,使用 QueryGenerator 以支持过滤
+        // 先取出 fairName,清空后传给 QueryGenerator,避免其自动添加等值查询
+        String fairName = recruitmentFair.getFairName();
+        recruitmentFair.setFairName(null);
         QueryWrapper<RecruitmentFair> queryWrapper = QueryGenerator.initQueryWrapper(recruitmentFair, req.getParameterMap());
+        
+        // 手动添加模糊查询条件
+        if (org.jeecg.common.util.oConvertUtils.isNotEmpty(fairName)) {
+            queryWrapper.like("fair_name", fairName);
+        }
+        
         queryWrapper.in("id", fairIds);
         if (org.jeecg.common.util.oConvertUtils.isEmpty(req.getParameter("column"))) {
             queryWrapper.orderByDesc("create_time");