调整

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-无相关数据 */

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);

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<>();
+        WxFormPush param = new WxFormPush();
-        lqw.eq(WxFormPushUser::getUserId, AuthContextUtils.getSysUserId());
+        param.setQueryUserId(AuthContextUtils.getSysUserId());
-        lqw.eq(WxFormPushUser::getReadFlag,0);
+        param.setStatus("1");
-        long unFinished = wxFormPushUserService.count(lqw);
+        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");
     }
 

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>