Merge remote-tracking branch 'origin/v1.0' into v1.0

# Conflicts:
#	src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java

src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java

@@ -53,12 +53,12 @@ public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> impl
         }
         if(parent==null){
             param.setPid("0");
-            param.setPostCode(StringUtils.genShortId()+IdUtil.genCode(4));
             param.setPathIds(param.getId());
         }else {
             param.setPathIds(parent.getPathIds()+"_"+param.getId());
         }
         if(dbData==null){
+            param.setPostCode(StringUtils.genShortId()+IdUtil.genCode(4));
             this.saveOrUpdate(param);
         }else {
             param.setPostCode(null);

src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java

@@ -234,17 +234,19 @@ public class TbsActivityTemplateController {
                 .map(TbsActivityTemplateRegion::getTemplateId).distinct().collect(Collectors.toList());
         LambdaQueryWrapper<TbsActivityTemplate> tmpLqw = new LambdaQueryWrapper<>();
         tmpLqw.eq(TbsActivityTemplate::getTemplateState,1);
-        tmpLqw.and(a->{
-            if(CollectionUtil.isNotEmpty(saleRegion)){
-                a.or(b->b.eq(TbsActivityTemplate::getSaleRegionFlag,0));
-            }
-            if(CollectionUtil.isNotEmpty(bizRegion)){
-                a.or(b->b.eq(TbsActivityTemplate::getBizRegionFlag,0));
-            }
-            if(CollectionUtil.isNotEmpty(templateRegions)){
-                a.or(b->b.in(TbsActivityTemplate::getId,templateIds));
-            }
-        });
+        if(CollectionUtil.isNotEmpty(saleRegion)||CollectionUtil.isNotEmpty(bizRegion)||CollectionUtil.isNotEmpty(templateRegions)){
+            tmpLqw.and(a->{
+                if(CollectionUtil.isNotEmpty(saleRegion)){
+                    a.or(b->b.eq(TbsActivityTemplate::getSaleRegionFlag,0));
+                }
+                if(CollectionUtil.isNotEmpty(bizRegion)){
+                    a.or(b->b.eq(TbsActivityTemplate::getBizRegionFlag,0));
+                }
+                if(CollectionUtil.isNotEmpty(templateRegions)){
+                    a.or(b->b.in(TbsActivityTemplate::getId,templateIds));
+                }
+            });
+        }
         if(StringUtils.hasText(templateName)){
             tmpLqw.like(TbsActivityTemplate::getTemplateName,templateName);
         }

src/main/java/com/qs/serve/modules/third/PortalFormPushController.java

@@ -27,7 +27,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -71,10 +73,17 @@ public class PortalFormPushController {
         List<WxUser> wxUserList = wxUserService.list(lqw);
         List<String> userCodes2 =  wxUserList.stream().map(WxUser::getSysUserCode).distinct().collect(Collectors.toList());
         List<WxFormPushUser> pushUserList = new ArrayList<>();
+        Set<String> wxUserIdSet = new HashSet<>();
         for (WxUser wxUser : wxUserList) {
-            if(wxUser.getOpenId().equals("0")){
+            if (wxUser.getOpenId().equals("0")) {
                 continue;
             }
+            boolean exist = wxUserIdSet.stream().anyMatch(a->a.equals(wxUser.getOpenId()));
+            if(exist){
+                continue;
+            }else {
+                wxUserIdSet.add(wxUser.getOpenId());
+            }
             WxSmsNewForm wxSmsNewForm = new WxSmsNewForm();
             wxSmsNewForm.setTitle(param.getTitle());
             wxSmsNewForm.setUserName(wxUser.getEmpName());

src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java

@@ -24,7 +24,9 @@ import com.qs.serve.modules.wx.entity.bo.WxFormPushBo;
 import javax.validation.Valid;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -128,16 +130,26 @@ public class WxFormPushController {
         userlqw.eq(WxFormPushUser::getFormPushId,entity.getId());
         List<WxFormPushUser> list = wxFormPushUserService.list(userlqw);
 
-        List<String> userCodes = list.stream().map(a->a.getUserCode()).collect(Collectors.toList());
+        List<String> userCodes = list.stream().map(WxFormPushUser::getUserCode).collect(Collectors.toList());
+        if(userCodes.size()<1){
+            return R.ok();
+        }
         WxApp app = wxAppService.getOne(new LambdaQueryWrapper<>(),false);
         LambdaQueryWrapper<WxUser> lqw = new LambdaQueryWrapper<>();
         lqw.eq(WxUser::getAppId,app.getId());
         lqw.in(WxUser::getSysUserCode,userCodes);
         List<WxUser> wxUserList = wxUserService.list(lqw);
+        Set<String> wxUserIdSet = new HashSet<>();
         for (WxUser wxUser : wxUserList) {
             if (wxUser.getOpenId().equals("0")) {
                 continue;
             }
+            boolean exist = wxUserIdSet.stream().anyMatch(a->a.equals(wxUser.getOpenId()));
+            if(exist){
+                continue;
+            }else {
+                wxUserIdSet.add(wxUser.getOpenId());
+            }
             WxSmsNewForm wxSmsNewForm = new WxSmsNewForm();
             wxSmsNewForm.setTitle(entity.getTitle());
             wxSmsNewForm.setUserName(wxUser.getEmpName());
@@ -207,10 +219,17 @@ public class WxFormPushController {
         lqw.in(WxUser::getSysUserId,userIds);
         List<WxUser> wxUserList = wxUserService.list(lqw);
         List<WxFormPushUser> pushUserList = new ArrayList<>();
+        Set<String> wxUserIdSet = new HashSet<>();
         for (WxUser wxUser : wxUserList) {
-            if(wxUser.getOpenId().equals("0")){
+            if (wxUser.getOpenId().equals("0")) {
                 continue;
             }
+            boolean exist = wxUserIdSet.stream().anyMatch(a->a.equals(wxUser.getOpenId()));
+            if(exist){
+                continue;
+            }else {
+                wxUserIdSet.add(wxUser.getOpenId());
+            }
             WxSmsNewForm wxSmsNewForm = new WxSmsNewForm();
             wxSmsNewForm.setTitle(param.getTitle());
             wxSmsNewForm.setUserName(wxUser.getEmpName());
@@ -261,7 +280,6 @@ public class WxFormPushController {
                 return R.error("已发布的消息不能删除");
             }
         }
-
         boolean result = wxFormPushService.removeByIds(idsLong);
         return R.isTrue(result);
     }

src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java

@@ -14,6 +14,7 @@ import com.qs.serve.modules.baz.entity.BazVisitInstance;
 import com.qs.serve.modules.wx.entity.WxFormPush;
 import com.qs.serve.modules.wx.entity.WxFormPushUser;
 import com.qs.serve.modules.wx.entity.bo.WxFormPushBo;
+import com.qs.serve.modules.wx.mapper.WxFormPushMapper;
 import com.qs.serve.modules.wx.service.WxFormPushService;
 import com.qs.serve.modules.wx.service.WxFormPushUserService;
 import lombok.AllArgsConstructor;
@@ -39,7 +40,7 @@ import java.util.Map;
 public class WxFormPushMyController {
 
     private WxFormPushService wxFormPushService;
-
+    private WxFormPushMapper wxFormPushMapper;
     private WxFormPushUserService wxFormPushUserService;
 
     /**
@@ -48,18 +49,20 @@ public class WxFormPushMyController {
      * @return
      */
     @GetMapping("/page")
-    public R<PageVo<WxFormPush>> getList(WxFormPushUser param){
-        LambdaQueryWrapper<WxFormPushUser> lqw = new LambdaQueryWrapper<>(param);
+    public R<PageVo<WxFormPush>> getList(WxFormPush param){
+//        lqw.eq(WxFormPushUser::getUserId,AuthContextUtils.getSysUserId());
+//        List<WxFormPushUser> list = wxFormPushUserService.list(lqw);
+//        List<WxFormPush> result = new ArrayList<>();
+//        for (WxFormPushUser pushUser : list) {
+//            WxFormPush formPush = wxFormPushService.getById(pushUser.getFormPushId());
+//            formPush.setReadFlag(pushUser.getReadFlag());
+//            result.add(formPush);
+//        }
         PageUtil.startPage();
-        lqw.eq(WxFormPushUser::getUserId,AuthContextUtils.getSysUserId());
-        List<WxFormPushUser> list = wxFormPushUserService.list(lqw);
-        List<WxFormPush> result = new ArrayList<>();
-        for (WxFormPushUser pushUser : list) {
-            WxFormPush formPush = wxFormPushService.getById(pushUser.getFormPushId());
-            formPush.setReadFlag(pushUser.getReadFlag());
-            result.add(formPush);
-        }
-        return R.byPageHelperList(result);
+        param.setQueryUserId(AuthContextUtils.getSysUserId());
+        param.setStatus("1");
+        List<WxFormPush> formPushUsers = wxFormPushMapper.selectUserFormPushList(param);
+        return R.byPageHelperList(formPushUsers);
     }
 
     /**
@@ -86,7 +89,7 @@ public class WxFormPushMyController {
     @SysLog(module = SystemModule.Verification, title = "表单推送", biz = BizType.QUERY)
     public R<WxFormPush> getById(@PathVariable("id") String id){
         WxFormPush wxFormPush = wxFormPushService.getById(id);
-        if(wxFormPush.getStatus().equals(0)){
+        if(wxFormPush.getStatus().equals("0")){
             //未发布不能查询
             wxFormPush.setId(null);
             wxFormPush.setTitle(null);

src/main/java/com/qs/serve/modules/wx/entity/WxFormPush.java

@@ -100,6 +100,10 @@ public class WxFormPush implements Serializable {
     @TableField(exist = false)
     private Integer readFlag;
 
+    /** 查询的用户id */
+    @TableField(exist = false)
+    private String queryUserId;
+
     @TableField(exist = false)
     private List<WxFormPushUser> wxFormPushUserList;
 

src/main/java/com/qs/serve/modules/wx/entity/bo/WxFormPushBo.java

@@ -46,7 +46,7 @@ public class WxFormPushBo implements Serializable {
     @NotNull(message = "人员ID不能为空")
     private List<String> userIds;
 
-    //是否发布，保存并发布->1,保存草稿->0
+    /** 是否发布，保存并发布->1,保存草稿->0 */
     @NotNull(message = "状态不能为空")
     private String status;
 

src/main/java/com/qs/serve/modules/wx/mapper/WxFormPushMapper.java

@@ -2,7 +2,8 @@ package com.qs.serve.modules.wx.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qs.serve.modules.wx.entity.WxFormPush;
-
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
 /**
  * 表单推送 Mapper
  * @author YenHex
@@ -10,5 +11,7 @@ import com.qs.serve.modules.wx.entity.WxFormPush;
  */
 public interface WxFormPushMapper extends BaseMapper<WxFormPush> {
 
+    List<WxFormPush> selectUserFormPushList(@Param("query") WxFormPush param);
+
 }
 

src/main/resources/mapper/wx/WxFormPushMapper.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qs.serve.modules.wx.mapper.WxFormPushMapper">
+
+    <resultMap id="wxFormPushMap" type="com.qs.serve.modules.wx.entity.WxFormPush" >
+        <result property="id"  column="id"/>
+        <result property="typeId"  column="type_id"/>
+        <result property="typeCode"  column="type_code"/>
+        <result property="typeName"  column="type_name"/>
+        <result property="title"  column="title"/>
+        <result property="formContext"  column="form_context"/>
+        <result property="formContextValue"  column="form_context_value"/>
+        <result property="remark"  column="remark"/>
+        <result property="createTime"  column="create_time"/>
+        <result property="updateTime"  column="update_time"/>
+        <result property="tenantId"  column="tenant_id"/>
+        <result property="createBy"  column="create_by"/>
+        <result property="updateBy"  column="update_by"/>
+        <result property="delFlag"  column="del_flag"/>
+        <result property="status"  column="status"/>
+        <result property="businessType"  column="business_type"/>
+        <result property="readFlag"  column="read_flag"/>
+    </resultMap>
+
+    <sql id="wxFormPushSql">
+        wx_form_push.`id`,
+        wx_form_push.`type_id`,
+        wx_form_push.`type_code`,
+        wx_form_push.`type_name`,
+        wx_form_push.`title`,
+        wx_form_push.`form_context`,
+        wx_form_push.`form_context_value`,
+        wx_form_push.`remark`,
+        wx_form_push.`create_time`,
+        wx_form_push.`update_time`,
+        wx_form_push.`tenant_id`,
+        wx_form_push.`create_by`,
+        wx_form_push.`update_by`,
+        wx_form_push.`del_flag`,
+        wx_form_push.`status`,
+        wx_form_push.`business_type`    </sql>
+
+    <select id="selectUserFormPushList" parameterType="com.qs.serve.modules.wx.entity.WxFormPush" resultMap="wxFormPushMap">
+        SELECT
+        wx_form_push_user.read_flag,
+        <include refid="wxFormPushSql"/>
+        FROM `wx_form_push` `wx_form_push`
+        left join wx_form_push_user `wx_form_push_user`
+            on  `wx_form_push_user`.`form_push_id` = `wx_form_push`.`id`
+        <where>
+            <if test="query.id != null and query.id != ''"> and `wx_form_push`.`id` = #{query.id}</if>
+            <if test="query.typeId != null and query.typeId != ''"> and `wx_form_push`.`type_id` = #{query.typeId}</if>
+            <if test="query.typeCode != null and query.typeCode != ''"> and `wx_form_push`.`type_code` = #{query.typeCode}</if>
+            <if test="query.typeName != null and query.typeName != ''"> and `wx_form_push`.`type_name` = #{query.typeName}</if>
+            <if test="query.title != null and query.title != ''"> and `wx_form_push`.`title` = #{query.title}</if>
+            <if test="query.createTime != null"> and `wx_form_push`.`create_time` = #{query.createTime}</if>
+            <if test="query.updateTime != null"> and `wx_form_push`.`update_time` = #{query.updateTime}</if>
+            <if test="query.tenantId != null and query.tenantId != ''"> and `wx_form_push`.`tenant_id` = #{query.tenantId}</if>
+            <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.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.queryUserId != null and query.queryUserId != ''">
+                and `wx_form_push_user`.`user_id` = #{query.queryUserId}
+            </if>
+        </where>
+    </select>
+
+</mapper>