已知bug修复

fs-admin/src/main/java/com/fs/qw/controller/QwSopTempController.java

@@ -58,6 +58,15 @@ public class QwSopTempController extends BaseController
     {
 
 //        List<QwSopTemp> list = qwSopTempService.selectQwSopTempList(qwSopTemp);
+
+        if(qwSopTemp.getPageNum() == null) {
+            qwSopTemp.setPageNum(1);
+        }
+        if(qwSopTemp.getPageSize() == null) {
+            qwSopTemp.setPageSize(10);
+        }
+
+        PageHelper.startPage(qwSopTemp.getPageNum(), qwSopTemp.getPageSize());
         List<QwSopTemp> list = qwSopTempService.selectQwSopTempListNew(qwSopTemp);
         // 收集所有需要查询的用户ID
         Set<Long> userIds = list.stream()
@@ -87,14 +96,6 @@ public class QwSopTempController extends BaseController
             });
         }
 
-        if(qwSopTemp.getPageNum() == null) {
-            qwSopTemp.setPageNum(1);
-        }
-        if(qwSopTemp.getPageSize() == null) {
-            qwSopTemp.setPageSize(10);
-        }
-
-        PageHelper.startPage(qwSopTemp.getPageNum(), qwSopTemp.getPageSize());
 
         return R.ok().put("data",new PageInfo<>(list));
     }

fs-company/src/main/java/com/fs/company/controller/qw/QwAssignRuleController.java

@@ -1,5 +1,6 @@
 package com.fs.company.controller.qw;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -39,10 +40,14 @@ public class QwAssignRuleController {
     public Result<IPage<QwAssignRule>> page(
             @RequestParam(defaultValue = "1") Long pageNum,
             @RequestParam(defaultValue = "10") Long pageSize,
-            @RequestParam(required = false) String ruleName
+            @RequestParam(required = false) String ruleName,
+            @RequestParam(required = false) Integer  status
     ) {
         Page<QwAssignRule> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<QwAssignRule> wrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(status)){
+            wrapper.eq(QwAssignRule::getStatus,status);
+        }
         wrapper.like(StrUtil.isNotBlank(ruleName), QwAssignRule::getRuleName, ruleName);
         wrapper.orderByDesc(QwAssignRule::getCreateTime);
         IPage<QwAssignRule> result = qwAssignRuleService.page(page, wrapper);

fs-service/src/main/java/com/fs/qw/mapper/QwFriendWelcomeMapper.java

@@ -89,6 +89,8 @@ public interface QwFriendWelcomeMapper
             "       ) AND " +
             "   </if>" +
             "   <if test=\"isSendMsg != null\"> qfw.is_send_msg = #{isSendMsg} AND </if>" +
+            "  <if test=\"createTime != null \"> DATE(qfw.create_time) = DATE(#{createTime}) AND</if>\n" +
+            "  <if test=\"updateTime != null \"> DATE(qfw.update_time) = DATE(#{updateTime}) AND</if>\n" +
             "   <if test=\"welcomeText != null and welcomeText != ''\"> qfw.welcome_text = #{welcomeText} AND </if>" +
             "   <if test=\"isDayparting != null\"> qfw.is_dayparting = #{isDayparting} AND </if>" +
             "   <if test=\"companyId != null\"> qfw.company_id = #{companyId} AND </if>" +