Merge branch 'dev'

# Conflicts:
#	src/main/java/com/huiju/estateagents/controller/TaCustomImgController.java

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -22,6 +22,7 @@ import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import me.chanjar.weixin.common.error.WxErrorException;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -77,6 +79,9 @@ public class MiniAppController extends BaseController {
     @Autowired
     public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
+    @Autowired
+    private ITaCustomImgService iTaCustomImgService;
+
 
     /**
      * 验证接入
@@ -220,6 +225,14 @@ public class MiniAppController extends BaseController {
             result.put("extraInfo", extraInfo);
             result.put("miniAuthorized", null != taPerson.getAvatarurl() && taPerson.getAvatarurl().indexOf("wx.qlogo.cn") > 0);
 
+            //返回是否授权标识
+            QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("img_type", "auth");
+            List<TaCustomImg>  taCustomImgs = iTaCustomImgService.list(queryWrapper);
+            result.put("avatarAuth", CollectionUtils.isEmpty(taCustomImgs) ? false : "1".equals(taCustomImgs.get(0).getImgUrl()) ? true: false);
+
+
             String token = (String) miniResp.get("token");
             sysTokenService.saveToken(token);
 

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -215,7 +215,7 @@
                 where t.event_type = 'building'
                 and t.consultant_id = #{userId}
                 and t.org_id = #{orgId}
-                and t.`event` = 'share' order by t.visit_time desc
+                and t.`event` = 'share' order by t.visit_time desc limit 9999
             ) t
             group by t.target_id
 
@@ -236,7 +236,7 @@
         where t.event_type = 'activity'
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
-        and t.`event` = 'share' order by t.visit_time desc
+        and t.`event` = 'share' order by t.visit_time desc limit 9999
         ) t
         group by t.target_id
 
@@ -257,7 +257,7 @@
         where t.event_type = 'help'
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
-        and t.`event` = 'share' order by t.visit_time desc
+        and t.`event` = 'share' order by t.visit_time desc limit 9999
         ) t
         group by t.target_id
 
@@ -279,7 +279,7 @@
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
         and t.`event` = 'share'
-        group by t.target_id order by t.visit_time desc
+        group by t.target_id order by t.visit_time desc limit 9999
         ) t
 
         union all
@@ -299,7 +299,7 @@
         where t.event_type = 'news'
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
-        and t.`event` = 'share' order by t.visit_time desc
+        and t.`event` = 'share' order by t.visit_time desc limit 9999
         ) t
         group by t.target_id
 
@@ -320,7 +320,7 @@
             where t.event_type = 'h5'
             and t.consultant_id = #{userId}
             and t.org_id = #{orgId}
-            and t.`event` = 'share' order by t.visit_time desc
+            and t.`event` = 'share' order by t.visit_time desc limit 9999
             ) t
             group by t.target_id
         ) t