bugfix

src/main/java/com/caimei365/user/mapper/SellerMapper.java

@@ -73,4 +73,6 @@ public interface SellerMapper {
     Integer findManager(String mobile);
 
     Integer findManagerByUser(Integer userId);
+
+    Integer findLeaderId(Integer userId);
 }

src/main/java/com/caimei365/user/model/vo/UserLoginVo.java

@@ -147,4 +147,7 @@ public class UserLoginVo implements Serializable {
 
     @ApiModelProperty("是否是协销总管理员标记 1是，2否")
     private Integer manager;
+
+    @ApiModelProperty("是否是协销组长，有id则是，没有则不是")
+    private Integer leaderId;
 }

src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java

@@ -476,15 +476,15 @@ public class ClubServiceImpl implements ClubService {
             }
             if (StringUtils.isNotBlank(r.getConsult())) {
                 if (r.getConsult().contains(",")) {
-                    List<String> cons = Arrays.asList(r.getConsult().split(","));
+                    String[] split = r.getConsult().split(",");
                     String Cons = "";
-                    for (String con : cons) {
+                    for (String con : split) {
                         Cons += clubMapper.findConsultById(con).getClassName() + ",";
                     }
                     Cons = Cons.substring(0, Cons.length() - 1);
-                    remarkVo.setConsult(Cons);
+                    remarkVo.setConsultBack(Cons);
                 } else {
-                    remarkVo.setConsult(clubMapper.findConsultById(r.getConsult()).getClassName());
+                    remarkVo.setConsultBack(clubMapper.findConsultById(r.getConsult()).getClassName());
                 }
             }
             remarkVo.setLeaderName(r.getLeaderName());
@@ -498,6 +498,9 @@ public class ClubServiceImpl implements ClubService {
             remarkVo.setClubName(r.getClubName());
             remarkVos.add(remarkVo);
         });
+        if (StringUtils.isNotBlank(consult)) {
+            remarkVos.removeIf(r -> !r.getConsult().contains(consult));
+        }
         PaginationVo<RemarkVo> pageVo = new PaginationVo<>(remarkVos);
         pageVo.setTotalPage(pageInfo.getPages());
         pageVo.setHasNextPage(pageInfo.isHasNextPage());
@@ -708,6 +711,24 @@ public class ClubServiceImpl implements ClubService {
         } else {
             remarksList = clubMapper.getVisitorListByKey(serviceProviderId, keyWord);
         }
+        for (VisitorRemarkVo visitorRemarkVo : remarksList) {
+            if (StringUtils.isNotBlank(visitorRemarkVo.getConsult())) {
+                if (visitorRemarkVo.getConsult().contains(",")) {
+                    String[] split = visitorRemarkVo.getConsult().split(",");
+                    String Cons = "";
+                    for (String con : split) {
+                        Cons += clubMapper.findConsultById(con).getClassName() + ",";
+                    }
+                    Cons = Cons.substring(0, Cons.length() - 1);
+                    visitorRemarkVo.setConsultBack(Cons);
+                } else {
+                    visitorRemarkVo.setConsultBack(clubMapper.findConsultById(visitorRemarkVo.getConsult()).getClassName());
+                }
+            }
+        }
+        if (StringUtils.isNotBlank(consult)) {
+            remarksList.removeIf(r -> !r.getConsult().contains(consult));
+        }
         return ResponseJson.success(new PaginationVo<>(remarksList));
     }
 

src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

@@ -172,6 +172,7 @@ public class LoginServiceImpl implements LoginService {
             redisService.set(sellerToken, sellerToken, JwtUtil.getExpireTime());
             seller.setToken(sellerToken);
             seller.setManager(sellerMapper.findManagerByUser(seller.getUserId()));
+            seller.setLeaderId(sellerMapper.findLeaderId(seller.getUserId()));
             return ResponseJson.success(seller);
         }
         // 运营人员授权登录
@@ -322,6 +323,7 @@ public class LoginServiceImpl implements LoginService {
         // 登录异步赠送10采美豆
         asyncService.loginUpdateBeans(loginUser.getUserId(), loginUser.getUserIdentity());
         loginUser.setManager(sellerMapper.findManagerByUser(loginUser.getUserId()));
+        loginUser.setLeaderId(sellerMapper.findLeaderId(loginUser.getUserId()));
         log.info("【登录】-----登录成功，userId:" + loginUser.getUserId());
         return ResponseJson.success("登录成功", loginUser);
     }

src/main/resources/mapper/ClubMapper.xml

@@ -421,7 +421,7 @@
     </select>
     <select id="getRemarksListByKey" resultType="com.caimei365.user.model.vo.RemarksVo">
         select ccr.id as remarksId, ccr.remarks, ccr.addTime, ccr.questionMan, ccr.clubId,c.Name as clubName,ccr.serviceProviderId,
-        (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderId) AS recordName
+        (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderId) AS recordName,ccr.consultType as consult
         from cm_club_remarks ccr
         LEFT JOIN club c ON c.clubID = ccr.clubId
         where ccr.serviceProviderId = #{serviceProviderId}
@@ -433,7 +433,7 @@
         order by addTime desc
     </select>
     <select id="getVisitorListByKey" resultType="com.caimei365.user.model.vo.VisitorRemarkVo">
-        SELECT questionManId, serviceProviderId, addTime as addDate, questionMan
+        SELECT questionManId, serviceProviderId, addTime as addDate, questionMan,consultType as consult
         FROM cm_visitor_remarks
         WHERE serviceProviderId = #{serviceProviderId}
          <if test="keyWord != null and keyWord != ''">

src/main/resources/mapper/SellerMapper.xml

@@ -161,4 +161,9 @@
         LEFT JOIN serviceprovider s ON csm.serviceProviderId = s.serviceProviderId
         WHERE s.userID  = #{userId}
     </select>
+    <select id="findLeaderId" resultType="java.lang.Integer">
+        SELECT leaderId FROM cm_serviceteam_role csr
+        LEFT JOIN serviceprovider s ON s.serviceProviderId=csr.leaderId
+        WHERE s.userId = #{userId}
+    </select>
 </mapper>