bug fix

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -19,6 +19,7 @@ import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.entity.TaChannelAppRelation;
 import com.huiju.estateagents.service.ITaChannelAppRelationService;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -243,11 +244,14 @@ public class SysUserChannelController extends BaseController {
             taChannelAppRelation.forEach(e->{
                 orgIdList.add(e.getOrgId());
             });
-            QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
-            taUserQueryWrapper.in("org_id", orgIdList);
-            TaUser taUser = new TaUser();
-            taUser.setStatus(taChannelProxy.getStatus());
-            iTaUserService.update(taUser, taUserQueryWrapper);
+            if (CollectionUtils.isNotEmpty(orgIdList)){
+                QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+                taUserQueryWrapper.in("org_id", orgIdList);
+                TaUser taUser = new TaUser();
+                taUser.setStatus(taChannelProxy.getStatus());
+                iTaUserService.update(taUser, taUserQueryWrapper);
+            }
+
         }
 
         QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -145,7 +145,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             // 只尝试去解析
             Jwts.parser().setSigningKey(JWTUtils.key).parseClaimsJws(jwtAuths[1]);
         } catch (ExpiredJwtException e) {
-            ResponseBean resp = ResponseBean.error("权限验证非法, Token 已过期", ResponseBean.ERROR_AUTH_EXPIRED);
+            ResponseBean resp = ResponseBean.error("权限验证非法, 身份信息已过期", ResponseBean.ERROR_AUTH_EXPIRED);
             response.addHeader("Content-type", "application/json");
             response.getOutputStream().write(JSONObject.toJSONBytes(resp));
             return false;

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -304,7 +304,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "update");
         if (!isMainMoreThanTenFlag){
-            responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
+            responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
             return responseBean;
         }
 
@@ -458,6 +458,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
+        boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "add");
+        if (!isMainMoreThanTenFlag){
+            responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
+            return responseBean;
+        }
+
         building.setCreateDate(LocalDateTime.now());
         building.setStatus(2);
         building.setOrgId(orgId);
@@ -553,7 +559,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(taBuildingMapper.selectOne(buildingIdQueryWrapper), orgId, status, "updateStatus");
         if (!isMainMoreThanTenFlag){
-            responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
+            responseBean.addError("当前城市最多只能推荐10个项目至首页哦");
             return responseBean;
         }
 
@@ -944,9 +950,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         if (taBuilding.getIsMain() != 1){
             return true;
         }
-        if (operte.equals("update") && (info.getStatus() == 2)){
-            return true;
-        }
+//        if (operte.equals("update") && (info.getStatus() == 2)){
+//            return true;
+//        }
         if (operte.equals("updateStatus") && status == 2){
             return true;
         }

src/main/java/com/huiju/estateagents/service/impl/TaShareServiceImpl.java

@@ -71,6 +71,10 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         queryWrapper.eq("tagert_type", typeOf);
         List<TaShare> uvs = taShareMapper.selectList(queryWrapper);
         if (null != uvs && uvs.size() > 0) {
+            //更新分享为最新时间
+            TaShare taShare = new TaShare();
+            taShare.setCreateDate(LocalDateTime.now());
+            taShareMapper.update(taShare, queryWrapper);
             return ResponseBean.success("");
         }
 

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -123,7 +123,7 @@
 
     <select id="getWxActivityVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         SELECT
-            t.* ,
+            t.share_from_id, t.share_person, t.share_person_type, t.person_id, t.target_type, t.target_id, t.create_date as visit_time, t.org_id ,building_id, t.status, t.is_first_time,
 	        p.`name` as user_name,
 	        p.`nickname` as nickname,
 	        p.avatarurl

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -559,6 +559,7 @@ FROM
                 and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
             and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+            AND b.person_id not IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id is not null AND person_id != ''  )
         </where>
         order by b.create_date desc
         limit #{pageCode}, #{pageSize}