Merge branch '20251119-wyp-weCom' into test

api-module/src/main/java/com/tzld/piaoquan/api/dao/mapper/wecom/thirdpart/ext/ThirdPartWeComRoomMapperExt.java

@@ -8,10 +8,9 @@ import java.util.List;
 
 public interface ThirdPartWeComRoomMapperExt {
 
-    int getRoomCount(@Param("param") ThirdPartyRoomListParam param, @Param("pushAccountIds") List<Long> pushAccountIds);
+    int getRoomCount(@Param("param") ThirdPartyRoomListParam param);
 
     List<ThirdPartWeComRoom> getRoomList(@Param("param") ThirdPartyRoomListParam param,
-                                         @Param("pushAccountIds") List<Long> pushAccountIds,
                                          @Param("offset") int offset, @Param("pageSize") Integer pageSize);
 
     List<ThirdPartWeComRoom> getNoConfigRoomList(@Param("staffId") Long id);

api-module/src/main/java/com/tzld/piaoquan/api/model/param/wecom/thirdpart/ThirdPartyRoomListParam.java

@@ -11,6 +11,6 @@ public class ThirdPartyRoomListParam extends PageParam {
     private String corpName;
     @ApiModelProperty(value = "群主")
     private String groupLeaderName;
-    @ApiModelProperty(value = "推送人员")
-    private String pushAccountName;
+    @ApiModelProperty(value = "群名称")
+    private String roomName;
 }

api-module/src/main/java/com/tzld/piaoquan/api/service/wecom/thirdparty/impl/WeComThirdPartyRoomServiceImpl.java

@@ -53,16 +53,12 @@ public class WeComThirdPartyRoomServiceImpl implements WeComThirdPartyRoomServic
     public Page<ThirdPartyRoomVO> list(ThirdPartyRoomListParam param) {
         Page<ThirdPartyRoomVO> result = new Page<>(param.getPageNum(), param.getPageSize());
         int offset = (param.getPageNum() - 1) * param.getPageSize();
-        List<Long> pushAccountIds = null;
-        if (StringUtils.isNotBlank(param.getPushAccountName())) {
-            pushAccountIds = staffMapperExt.getStaffIdByName(param.getPushAccountName());
-        }
-        int count = roomMapperExt.getRoomCount(param, pushAccountIds);
+        int count = roomMapperExt.getRoomCount(param);
         result.setTotalSize(count);
         if (count == 0) {
             return result;
         }
-        List<ThirdPartWeComRoom> roomList = roomMapperExt.getRoomList(param, pushAccountIds, offset, param.getPageSize());
+        List<ThirdPartWeComRoom> roomList = roomMapperExt.getRoomList(param, offset, param.getPageSize());
         List<ThirdPartyRoomVO> list = buildThirdPartyRoomVOList(roomList);
         result.setObjs(list);
         return result;

api-module/src/main/resources/mapper/wecom/thirdpart/ext/ThirdPartWeComRoomMapperExt.xml

@@ -15,11 +15,8 @@
         <if test="param.groupLeaderName != null">
             and staff.name like concat('%', #{param.groupLeaderName}, '%')
         </if>
-        <if test="pushAccountIds != null and pushAccountIds.size() > 0">
-            and (room_config.primary_third_staff_id in
-            <foreach collection="pushAccountIds" item="item" open="(" close=")" separator=",">#{item}</foreach>
-            or room_config.second_third_staff_id in
-            <foreach collection="pushAccountIds" item="item" open="(" close=")" separator=",">#{item}</foreach>)
+        <if test="param.roomName != null">
+            and room.name like concat('%', #{param.roomName}, '%')
         </if>
     </select>
 
@@ -37,11 +34,8 @@
         <if test="param.groupLeaderName!= null">
             and staff.name like concat('%', #{param.groupLeaderName}, '%')
         </if>
-        <if test="pushAccountIds != null and pushAccountIds.size() > 0">
-            and (room_config.primary_third_staff_id in
-            <foreach collection="pushAccountIds" item="item" open="(" close=")" separator=",">#{item}</foreach>
-            or room_config.second_third_staff_id in
-            <foreach collection="pushAccountIds" item="item" open="(" close=")" separator=",">#{item}</foreach>)
+        <if test="param.roomName != null">
+            and room.name like concat('%', #{param.roomName}, '%')
         </if>
         order by staff.id desc
         limit #{offset}, #{pageSize}