From 5e6ec4fc4a5cc77d85144608837dfd95b1fdf244 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 17 May 2023 08:43:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qs/serve/modules/his/entity/HisUserSupplier.java  |  2 ++
 .../modules/wx/controller/WxFormPushController.java   |  1 -
 .../wx/controller/my/WxFormPushMyController.java      | 11 ++++++-----
 src/main/resources/mapper/wx/WxFormPushMapper.xml     |  1 +
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java
index 6edf93f5..8710f734 100644
--- a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java
+++ b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java
@@ -43,10 +43,12 @@ public class HisUserSupplier implements Serializable {
 
     /** 供应商名称 */
     @Length(max = 50,message = "供应商名称长度不能超过50字")
+    @TableField(condition = SqlCondition.LIKE)
     private String supplierName;
 
     /** 供应商编码 */
     @Length(max = 30,message = "供应商编码长度不能超过30字")
+    @TableField(condition = SqlCondition.LIKE)
     private String supplierCode;
 
     /** 类型：0=销售区域；1=行政区域；2-供应商负责人；9-无相关数据 */
diff --git a/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java b/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java
index c95763f0..29523d3e 100644
--- a/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java
+++ b/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java
@@ -263,7 +263,6 @@ public class WxFormPushController {
             wxFormPushService.updateById(entity);
         }
         //保存推送人员
-
         List<String> userIds = param.getUserIds().stream().distinct().collect(Collectors.toList());
         LambdaQueryWrapper<WxUser> lqw = new LambdaQueryWrapper<>();
         WxApp app = wxAppService.getOne(new LambdaQueryWrapper<>(),false);
diff --git a/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java b/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java
index 0da43db2..23eb76b9 100644
--- a/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java
+++ b/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java
@@ -68,12 +68,13 @@ public class WxFormPushMyController {
      */
     @GetMapping("/getCounter")
     public R<?> getPage(){
-        LambdaQueryWrapper<WxFormPushUser> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(WxFormPushUser::getUserId, AuthContextUtils.getSysUserId());
-        lqw.eq(WxFormPushUser::getReadFlag,0);
-        long unFinished = wxFormPushUserService.count(lqw);
+        WxFormPush param = new WxFormPush();
+        param.setQueryUserId(AuthContextUtils.getSysUserId());
+        param.setStatus("1");
+        param.setReadFlag(0);
+        List<WxFormPush> formPushUsers = wxFormPushMapper.selectUserFormPushList(param);
         Map<String,Object> map = new HashMap<>();
-        map.put("unFinished",unFinished);
+        map.put("unFinished",formPushUsers.size());
         return R.ok(map,"ok");
     }
 
diff --git a/src/main/resources/mapper/wx/WxFormPushMapper.xml b/src/main/resources/mapper/wx/WxFormPushMapper.xml
index e47c8f34..3393db7a 100644
--- a/src/main/resources/mapper/wx/WxFormPushMapper.xml
+++ b/src/main/resources/mapper/wx/WxFormPushMapper.xml
@@ -69,6 +69,7 @@
             <if test="query.createBy != null and query.createBy != ''"> and `wx_form_push`.`create_by` = #{query.createBy}</if>
             <if test="query.updateBy != null and query.updateBy != ''"> and `wx_form_push`.`update_by` = #{query.updateBy}</if>
             <if test="query.delFlag != null and query.delFlag != ''"> and `wx_form_push`.`del_flag` = #{query.delFlag}</if>
+            <if test="query.readFlag != null "> and `wx_form_push_user`.`read_flag` = #{query.readFlag}</if>
             <if test="query.status != null and query.status != ''"> and `wx_form_push`.`status` = #{query.status}</if>
             <if test="query.businessType != null and query.businessType != ''"> and `wx_form_push`.`business_type` = #{query.businessType}</if>
             <if test="query.formTitle != null and query.formTitle != ''"> and `wx_form_push`.`title` like concat('%',#{query.formTitle},'%') </if>