关注以及粉丝相关接口修改

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreClockInVo.java

@@ -15,6 +15,9 @@ public class StoreClockInVo extends StoreClockIn {
     @ApiModelProperty(value = "商家姓名")
     private String storeName;
 
+    @ApiModelProperty(value = "门店简介")
+    private String storeBlurb;
+
     @ApiModelProperty(value = "商家位置")
     private String storePosition;
 

alien-entity/src/main/java/shop/alien/mapper/LifeFansMapper.java

@@ -15,8 +15,9 @@ import java.util.List;
 @Mapper
 public interface LifeFansMapper extends BaseMapper<LifeFans> {
 
-    @Select("select MAX(foll.id) id, MAX(foll.name) name, MAX(foll.image) image, foll.phoneId, MAX(foll.blurb) blurb, MAX(foll.blockedType) blockedType, MAX(foll.blockedId) blockedId, MAX(foll.username) username, MAX(foll.accountBlurb) accountBlurb, MAX(foll.isMerchant) isMerchant, " +
-            "  MAX(lb.id) blackListid, MAX(if(isnull(fans.id), 0, 1)) isFollowMe, 1 as isFollowThis,  " +
+    @Select("<script>" +
+            "select MAX(foll.id) id, MAX(foll.name) name, MAX(foll.image) image, foll.phoneId, MAX(foll.blurb) blurb, MAX(foll.blockedType) blockedType, MAX(foll.blockedId) blockedId, MAX(foll.username) username, MAX(foll.accountBlurb) accountBlurb, MAX(foll.isMerchant) isMerchant, " +
+            "  MAX(lb.id) blackListid, MAX(if(isnull(fans.id), 0, 1)) isFollowMe, MAX(if(isnull(fans_this.id), 0, 1)) isFollowThis, MAX(if(isnull(lb.id), '0', '1')) isBlocked,  " +
             "  (select count(1) from life_fans where fans_id= foll.phoneId and delete_flag =0) followNum, " +
             "  (select count(1) from life_fans where followed_id= foll.phoneId and delete_flag =0) fansNum from ( " +
             "    with follow as (   " +
@@ -31,16 +32,20 @@ public interface LifeFansMapper extends BaseMapper<LifeFans> {
             "    join store_info info on info.id = user.store_id " +
             "    left join store_img img on img.store_id = user.store_id and img.img_type = '10' and img.delete_flag = 0 " +
             "    where foll.flag = 'store' and user.delete_flag = 0 and info.delete_flag = 0 " +
+            "<if test=\"onlyStoreFollowed == false\">" +
             "    union " +
             "    select user.id, user.user_name name, user.user_image image, concat('user_', user.user_phone) phoneId, user.jianjie blurb, 2 blockedType,user.id blockedId,'' username, '' accountBlurb, '0' AS isMerchant " +
             "    from follow foll " +
             "    join life_user user on foll.phone = user.user_phone   " +
             "    where foll.flag = 'user' and user.delete_flag = 0   " +
+            "</if>" +
             ") foll   " +
-            "left join life_fans fans on fans.fans_id = foll.phoneId and fans.followed_id = #{fansId} and fans.delete_flag = 0 " +
+            "left join life_fans fans on fans.fans_id = foll.phoneId and fans.followed_id = #{relationFansId} and fans.delete_flag = 0 " +
+            "left join life_fans fans_this on fans_this.fans_id = #{relationFansId} and fans_this.followed_id = foll.phoneId and fans_this.delete_flag = 0 " +
             "left join life_blacklist lb on lb.blocked_type = foll.blockedType and lb.blocked_id = foll.blockedId and lb.blocker_type = #{blockerType} and lb.blocker_id = #{blockerId} and lb.delete_flag = 0 " +
-            "${ew.customSqlSegment} ")
-    IPage<LifeFansVo> getMyFollowed(IPage<LifeFansVo> iPage, @Param("fansId") String fansId, @Param("blockerType") String blockerType, @Param("blockerId") String blockerId, @Param(Constants.WRAPPER) QueryWrapper<LifeFansVo> wrapper);
+            "${ew.customSqlSegment} " +
+            "</script>")
+    IPage<LifeFansVo> getMyFollowed(IPage<LifeFansVo> iPage, @Param("fansId") String fansId, @Param("relationFansId") String relationFansId, @Param("blockerType") String blockerType, @Param("blockerId") String blockerId, @Param("onlyStoreFollowed") boolean onlyStoreFollowed, @Param(Constants.WRAPPER) QueryWrapper<LifeFansVo> wrapper);
 
 
     @Select("select foll.*, if(isnull(fans.id), 0, 1) isFollowMe, 1 as isFollowThis from ( " +
@@ -64,8 +69,9 @@ public interface LifeFansMapper extends BaseMapper<LifeFans> {
             "left join life_fans fans on fans.fans_id = foll.phoneId and fans.followed_id = #{fansId} and fans.delete_flag = 0 ")
     List<LifeFansVo> getMyFollowedAll(@Param("fansId") String fansId);
 
-    @Select("select MAX(foll.id) id, MAX(foll.name) name, MAX(foll.image) image, foll.phoneId, MAX(foll.blurb) blurb, MAX(foll.blockedType) blockedType, MAX(foll.blockedId) blockedId, MAX(foll.isMerchant) isMerchant, " +
-            "  MAX(lb.id) blackListid, MAX(if(isnull(fans.id), 0, 1)) isFollowThis, 1 as isFollowMe, " +
+    @Select("<script>" +
+            "select MAX(foll.id) id, MAX(foll.name) name, MAX(foll.image) image, foll.phoneId, MAX(foll.blurb) blurb, MAX(foll.blockedType) blockedType, MAX(foll.blockedId) blockedId, MAX(foll.isMerchant) isMerchant, " +
+            "  MAX(lb.id) blackListid, MAX(if(isnull(fans.id), 0, 1)) isFollowThis, MAX(if(isnull(fans_me.id), 0, 1)) isFollowMe, MAX(if(isnull(lb.id), '0', '1')) isBlocked, " +
             "    (select count(1) from life_fans fans2 where fans2.followed_id = foll.phoneId and fans2.delete_flag = 0) fansNum, " +
             "    (select count(1) from life_fans fans3 where fans3.fans_id = foll.phoneId and fans3.delete_flag = 0) followNum " +
             "from ( " +
@@ -80,16 +86,20 @@ public interface LifeFansMapper extends BaseMapper<LifeFans> {
             "    join store_info info on info.id = user.store_id " +
             "    left join store_img img on img.store_id = user.store_id and img.img_type = '10' and img.delete_flag = 0 " +
             "    where foll.flag = 'store' and user.delete_flag = 0 and info.delete_flag = 0" +
+            "<if test=\"onlyStoreFans == false\">" +
             "    union " +
             "    select user.id, user.user_name name, user.user_image image, concat('user_', user.user_phone) phoneId, user.jianjie blurb, 2 blockedType,user.id blockedId, '0' AS isMerchant" +
             "    from follow foll " +
             "    join life_user user on foll.phone = user.user_phone " +
             "    where foll.flag = 'user' and user.delete_flag = 0 " +
+            "</if>" +
             ") foll " +
-            "left join life_fans fans on fans.followed_id = foll.phoneId and fans.fans_id = #{fansId} and fans.delete_flag = 0 " +
+            "left join life_fans fans on fans.followed_id = foll.phoneId and fans.fans_id = #{relationFansId} and fans.delete_flag = 0 " +
+            "left join life_fans fans_me on fans_me.fans_id = foll.phoneId and fans_me.followed_id = #{relationFansId} and fans_me.delete_flag = 0 " +
             "left join life_blacklist lb on lb.blocked_type = foll.blockedType and lb.blocked_id = foll.blockedId and lb.blocker_type = #{blockerType} and lb.blocker_id = #{blockerId} and lb.delete_flag = 0 " +
-            "${ew.customSqlSegment} ")
-    IPage<LifeFansVo> getMyFans(IPage<LifeFansVo> iPage, @Param("fansId") String fansId, @Param("blockerType") String blockerType, @Param("blockerId") String blockerId, @Param(Constants.WRAPPER) QueryWrapper<LifeFansVo> wrapper);
+            "${ew.customSqlSegment} " +
+            "</script>")
+    IPage<LifeFansVo> getMyFans(IPage<LifeFansVo> iPage, @Param("fansId") String fansId, @Param("relationFansId") String relationFansId, @Param("blockerType") String blockerType, @Param("blockerId") String blockerId, @Param("onlyStoreFans") boolean onlyStoreFans, @Param(Constants.WRAPPER) QueryWrapper<LifeFansVo> wrapper);
 
 //    @Select("select foll.*, if(isnull(fans.id), 0, 1) isFollowThis, 1 as isFollowMe, count(fans2.id) fansNum, count(fans3.id) followNum from ( " +
 //            "    with follow as ( " +

alien-entity/src/main/java/shop/alien/mapper/StoreClockInMapper.java

@@ -22,7 +22,7 @@ import java.util.Map;
  */
 public interface StoreClockInMapper extends BaseMapper<StoreClockIn> {
 
-    @Select("select clock.id, clock.user_id, clock.store_id, clock.permission, user.user_name, store.store_name,store.score_avg score, clock.like_count, store.store_position, clock.content, clock.created_time, clock.img_url clockImg, img.img_url storeImg, user.user_image userImg,clock.maybe_ai_content," +
+    @Select("select clock.id, clock.user_id, clock.store_id, clock.permission, user.user_name, store.store_name, store.store_blurb storeBlurb, store.score_avg score, clock.like_count, store.store_position, clock.content, clock.created_time, clock.img_url clockImg, img.img_url storeImg, user.user_image userImg,clock.maybe_ai_content," +
             "store.administrative_region_district_name region, dict.dict_detail storeType, concat('user_', user.user_phone) phoneId, store.business_section,store.business_section_name,business_types_name,img1.img_url entranceImage," +
             "( " +
             " select ifnull(round(sum(uorder.price) / count(1), 0), 0) " +

alien-store/src/main/java/shop/alien/store/controller/CommonRatingController.java

@@ -192,14 +192,28 @@ public class CommonRatingController {
         return commonRatingService.getMyRatingList(pageNum, pageSize, businessType, userId, auditStatus);
     }
 
-    @ApiOperation("融合查询我的评价（门店 common_rating + 律师订单评价），按发布时间倒序")
+    @ApiOperation(value = "融合查询我的评价列表",
+            notes = "【请求】GET /commonRating/getMyMergedRatingList\n\n"
+                    + "【功能】合并「门店评价 common_rating」与「律师订单评价」，按发布时间倒序（新在前）；服务端合并后再分页。\n\n"
+                    + "【查询参数】\n"
+                    + "- pageNum：页码，默认 1\n"
+                    + "- pageSize：每页条数，默认 10\n"
+                    + "- businessType：门店侧 business_type，不传默认 1（门店评价），语义同 getMyRatingList\n"
+                    + "- userId：必填，被查询的用户 ID（Long）\n"
+                    + "- auditStatus：可选，仅过滤门店评价侧；律师订单评价不受此参数影响\n"
+                    + "- currentUserId：可选，传入时用于律师评价侧「是否已点赞」等当前用户态\n\n"
+                    + "【响应】外层统一 R；success=true 时 data 为分页对象（IPage），元素类型 MyMergedReviewItemVo。\n"
+                    + "- data.records：列表项，itemType=STORE 为门店评价，LAWYER 为律师订单评价，字段见模型说明\n"
+                    + "- data.total：门店评价总数 + 律师评价总数（合并前各自 total 之和）\n"
+                    + "- data.current、data.size、data.pages：标准分页字段\n\n"
+                    + "【错误】userId 为空时返回失败（msg 提示）。")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "当前页码", dataType = "Integer", paramType = "query"),
-            @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "Integer", paramType = "query"),
-            @ApiImplicitParam(name = "businessType", value = "门店侧业务类型，默认1-门店评价；与 getMyRatingList 一致", dataType = "Integer", paramType = "query"),
-            @ApiImplicitParam(name = "userId", value = "用户ID", dataType = "Long", paramType = "query", required = true),
-            @ApiImplicitParam(name = "auditStatus", value = "门店评价审核状态筛选，可选", dataType = "Integer", paramType = "query"),
-            @ApiImplicitParam(name = "currentUserId", value = "当前用户ID（律师评价列表判断是否已点赞），可选", dataType = "Integer", paramType = "query")
+            @ApiImplicitParam(name = "pageNum", value = "页码，默认 1", dataType = "Integer", paramType = "query", defaultValue = "1"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数，默认 10", dataType = "Integer", paramType = "query", defaultValue = "10"),
+            @ApiImplicitParam(name = "businessType", value = "门店侧业务类型，不传默认 1-门店评价", dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "userId", value = "用户 ID（必填）", dataType = "Long", paramType = "query", required = true, example = "10001"),
+            @ApiImplicitParam(name = "auditStatus", value = "门店评价审核状态筛选，可选；律师侧不过滤", dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "currentUserId", value = "当前登录用户 ID，可选；律师评价用于点赞态等", dataType = "Integer", paramType = "query")
     })
     @GetMapping("/getMyMergedRatingList")
     public R<IPage<MyMergedReviewItemVo>> getMyMergedRatingList(

alien-store/src/main/java/shop/alien/store/controller/LifeStoreController.java

@@ -59,11 +59,15 @@ public class LifeStoreController {
     @ApiImplicitParams({@ApiImplicitParam(name = "page", value = "页数", dataType = "Integer", paramType = "query", required = true),
             @ApiImplicitParam(name = "size", value = "页容", dataType = "Integer", paramType = "query", required = true),
             @ApiImplicitParam(name = "fansId", value = "粉丝id", dataType = "String", paramType = "query", required = true),
-            @ApiImplicitParam(name = "name", value = "名称", dataType = "String", paramType = "query")})
+            @ApiImplicitParam(name = "name", value = "名称", dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "筛选：不传或0=全部关注；1且fansId为店铺时仅店铺关注", dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "myFansId", value = "可选；有值时关注/拉黑四字段相对该 id，列表仍按 fansId", dataType = "String", paramType = "query")})
     @GetMapping("/getMyFollowed")
-    public R<IPage<LifeFansVo>> getMyFollowed(@RequestParam("fansId") String fansId, @RequestParam("name") String name, @RequestParam("page") int page, @RequestParam("size") int size) {
-        log.info("LifeStoreController.getMyFollowed?fansId={},name={},page={},size={}", fansId, name, page, size);
-        return R.data(lifeStoreService.getMyFollowed(fansId, name, page, size));
+    public R<IPage<LifeFansVo>> getMyFollowed(@RequestParam("fansId") String fansId, @RequestParam("name") String name, @RequestParam("page") int page, @RequestParam("size") int size,
+                                              @RequestParam(required = false) Integer type,
+                                              @RequestParam(required = false) String myFansId) {
+        log.info("LifeStoreController.getMyFollowed?fansId={},name={},page={},size={},type={},myFansId={}", fansId, name, page, size, type, myFansId);
+        return R.data(lifeStoreService.getMyFollowed(fansId, name, page, size, type, myFansId));
     }
 
     @ApiOperationSupport(order = 3)
@@ -71,11 +75,15 @@ public class LifeStoreController {
     @ApiImplicitParams({@ApiImplicitParam(name = "page", value = "页数", dataType = "Integer", paramType = "query", required = true),
             @ApiImplicitParam(name = "size", value = "页容", dataType = "Integer", paramType = "query", required = true),
             @ApiImplicitParam(name = "fansId", value = "粉丝id", dataType = "String", paramType = "query", required = true),
-            @ApiImplicitParam(name = "name", value = "名称", dataType = "String", paramType = "query")})
+            @ApiImplicitParam(name = "name", value = "名称", dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "筛选：不传或0=全部粉丝；1且fansId为店铺时仅店铺粉丝", dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "myFansId", value = "可选；有值时关注/拉黑四字段相对该 id，列表仍按 fansId", dataType = "String", paramType = "query")})
     @GetMapping("/getMyFans")
-    public R<IPage<LifeFansVo>> getMyFans(String fansId, @RequestParam(defaultValue = "") String name, @RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "10") int size) {
-        log.info("LifeStoreController.getMyFans?fansId={},name={},page={},size={}", fansId, name, page, size);
-        return R.data(lifeStoreService.getMyFans(fansId, name, page, size));
+    public R<IPage<LifeFansVo>> getMyFans(String fansId, @RequestParam(defaultValue = "") String name, @RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "10") int size,
+                                          @RequestParam(required = false) Integer type,
+                                          @RequestParam(required = false) String myFansId) {
+        log.info("LifeStoreController.getMyFans?fansId={},name={},page={},size={},type={},myFansId={}", fansId, name, page, size, type, myFansId);
+        return R.data(lifeStoreService.getMyFans(fansId, name, page, size, type, myFansId));
     }
 
     @ApiOperationSupport(order = 4)

alien-store/src/main/java/shop/alien/store/service/LifeStoreService.java

@@ -70,26 +70,34 @@ public class LifeStoreService {
 
     /**
      * 我的关注
+     *
+     * @param type 筛选类型：不传或 0 表示店铺+用户关注；1 且 fansId 为店铺时仅返回店铺类型关注
+     * @param myFansId 可选；有值时 isFollowMe、isFollowThis、isBlocked、blackListid 相对该主体计算，列表仍按 fansId
      */
-    public IPage<LifeFansVo> getMyFollowed(String fansId, String name, int page, int size) {QueryWrapper<LifeFansVo> wrapper = new QueryWrapper<>();
+    public IPage<LifeFansVo> getMyFollowed(String fansId, String name, int page, int size, Integer type, String myFansId) {
+        QueryWrapper<LifeFansVo> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotEmpty(name), "foll.name", name)
                 .or(StringUtils.isNotEmpty(name))
                 .like(StringUtils.isNotEmpty(name), "foll.phoneId", name);
         wrapper.groupBy("foll.phoneId");
+        String trimmedMyFansId = StringUtils.isNotEmpty(myFansId) ? myFansId.trim() : null;
+        String relationFansId = StringUtils.isNotEmpty(trimmedMyFansId) ? trimmedMyFansId : fansId;
+        String blockerSourceId = StringUtils.isNotEmpty(trimmedMyFansId) ? trimmedMyFansId : fansId;
         String blockerType = "";
         String blockerId = "";
-        if ("user".equals(fansId.split("_")[0])) {
-            String myselfUserPhone = fansId.split("_")[1];
+        if ("user".equals(blockerSourceId.split("_")[0])) {
+            String myselfUserPhone = blockerSourceId.split("_")[1];
             blockerType = "2";
             LifeUser myLifeUser = lifeUserService.getUserByPhone(myselfUserPhone);
             blockerId = String.valueOf(myLifeUser.getId());
         } else {
-            String myselfStorePhone = fansId.split("_")[1];
+            String myselfStorePhone = blockerSourceId.split("_")[1];
             blockerType = "1";
             StoreUser myStoreUser = storeUserService.getUserByPhone(myselfStorePhone);
             blockerId = String.valueOf(myStoreUser.getId());
         }
-        IPage<LifeFansVo> myFollowed = lifeFansMapper.getMyFollowed(new Page<>(page, size), fansId, blockerType, blockerId, wrapper);
+        boolean onlyStoreFollowed = (type != null && type == 1) && fansId != null && fansId.startsWith("store_");
+        IPage<LifeFansVo> myFollowed = lifeFansMapper.getMyFollowed(new Page<>(page, size), fansId, relationFansId, blockerType, blockerId, onlyStoreFollowed, wrapper);
         // 过滤掉我拉黑的
         List<LifeFansVo> collect = myFollowed.getRecords().stream().filter(x -> null == x.getBlackListid()).collect(Collectors.toList());
         myFollowed.setRecords(collect);
@@ -106,25 +114,32 @@ public class LifeStoreService {
 
     /**
      * 我的粉丝
+     *
+     * @param type 筛选类型：不传或 0 表示店铺+用户粉丝；1 且 fansId 为店铺时仅返回店铺粉丝
+     * @param myFansId 可选；有值时 isFollowMe、isFollowThis、isBlocked、blackListid 相对该主体计算，列表仍按 fansId
      */
-    public IPage<LifeFansVo> getMyFans(String fansId, String name, int page, int size) {
+    public IPage<LifeFansVo> getMyFans(String fansId, String name, int page, int size, Integer type, String myFansId) {
         QueryWrapper<LifeFansVo> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotEmpty(name), "foll.name", name);
         wrapper.groupBy("foll.phoneId");
+        String trimmedMyFansId = StringUtils.isNotEmpty(myFansId) ? myFansId.trim() : null;
+        String relationFansId = StringUtils.isNotEmpty(trimmedMyFansId) ? trimmedMyFansId : fansId;
+        String blockerSourceId = StringUtils.isNotEmpty(trimmedMyFansId) ? trimmedMyFansId : fansId;
         String blockerType = "";
         String blockerId = "";
-        if ("user".equals(fansId.split("_")[0])) {
-            String myselfUserPhone = fansId.split("_")[1];
+        if ("user".equals(blockerSourceId.split("_")[0])) {
+            String myselfUserPhone = blockerSourceId.split("_")[1];
             blockerType = "2";
             LifeUser myLifeUser = lifeUserService.getUserByPhone(myselfUserPhone);
             blockerId = String.valueOf(myLifeUser.getId());
         } else {
-            String myselfStorePhone = fansId.split("_")[1];
+            String myselfStorePhone = blockerSourceId.split("_")[1];
             blockerType = "1";
             StoreUser myStoreUser = storeUserService.getUserByPhone(myselfStorePhone);
             blockerId = String.valueOf(myStoreUser.getId());
         }
-        IPage<LifeFansVo> myFans = lifeFansMapper.getMyFans(new Page<>(page, size), fansId, blockerType, blockerId, wrapper);
+        boolean onlyStoreFans = (type != null && type == 1) && fansId != null && fansId.startsWith("store_");
+        IPage<LifeFansVo> myFans = lifeFansMapper.getMyFans(new Page<>(page, size), fansId, relationFansId, blockerType, blockerId, onlyStoreFans, wrapper);
         List<LifeFansVo> collect = myFans.getRecords().stream().filter(x -> null == x.getBlackListid()).collect(Collectors.toList());
         myFans.setRecords(collect);
         myFans.setTotal(collect.size());
@@ -260,11 +275,11 @@ public class LifeStoreService {
         
         // 统计关注数量（过滤被拉黑的）
         int followedNum = countFilteredRecords(phoneId, blockerType, blockerId, wrapper, pageSize, 
-                (page, w) -> lifeFansMapper.getMyFollowed(page, phoneId, blockerType, blockerId, w));
+                (page, w) -> lifeFansMapper.getMyFollowed(page, phoneId, phoneId, blockerType, blockerId, false, w));
 
         // 统计粉丝数量（过滤被拉黑的）
         int fansNum = countFilteredRecords(phoneId, blockerType, blockerId, wrapper, pageSize,
-                (page, w) -> lifeFansMapper.getMyFans(page, phoneId, blockerType, blockerId, w));
+                (page, w) -> lifeFansMapper.getMyFans(page, phoneId, phoneId, blockerType, blockerId, false, w));
 
         // 统计好友数量（过滤被拉黑的）
         int friendNum = countFilteredRecords(phoneId, blockerType, blockerId, wrapper, pageSize,

alien-store/src/main/java/shop/alien/store/service/impl/StoreClockInServiceImpl.java

@@ -458,6 +458,7 @@ public class StoreClockInServiceImpl extends ServiceImpl<StoreClockInMapper, Sto
         StoreInfo storeInfo = storeInfoMapper.selectById(storeClockIn.getStoreId());
         // 店铺名称
         storeClockInVo.setStoreName(storeInfo.getStoreName());
+        storeClockInVo.setStoreBlurb(storeInfo.getStoreBlurb());
         // 店铺头像
         LambdaQueryWrapper<StoreImg> eq = new LambdaQueryWrapper<StoreImg>().eq(StoreImg::getImgType, 10).eq(StoreImg::getStoreId, storeInfo.getId());
         StoreImg storeImg = storeImgMapper.selectOne(eq);
@@ -488,6 +489,11 @@ public class StoreClockInServiceImpl extends ServiceImpl<StoreClockInMapper, Sto
                 storeClockInVo.setIsCollect("1");
             }
         }
+
+        if(storeInfo.getBusinessSection() != null){
+            storeClockInVo.setBusinessSection(storeInfo.getBusinessSection().toString());
+        }
+        storeClockInVo.setBusinessSectionName(storeInfo.getBusinessSectionName());
         return storeClockInVo;
     }
 }