feat: 分组过滤增加 企微id

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/TabHaobanHmGroupSettingMapper.java

@@ -40,6 +40,6 @@ public interface TabHaobanHmGroupSettingMapper {
      * @param enterpriseId
      * @return
      */
-    List<TabHaobanHmGroupSetting> queryHmGroupSettingByName(@Param("enterpriseId") String enterpriseId, @Param("groupName") String groupName);
+    List<TabHaobanHmGroupSetting> queryHmGroupSettingByName(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("enterpriseId") String enterpriseId, @Param("groupName") String groupName);
 
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmGroupService.java

@@ -59,6 +59,6 @@ public interface HmGroupService {
      * @param enterpriseId
      * @return
      */
-    List<HmGroupSettingBO> queryGroupSettingByName(String enterpriseId, String groupName);
+    List<HmGroupSettingBO> queryGroupSettingByName(String wxEnterpriseId, String enterpriseId, String groupName);
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmGroupServiceImpl.java

@@ -136,8 +136,8 @@ public class HmGroupServiceImpl implements HmGroupService {
         }
     }
 
-    public List<HmGroupSettingBO> queryGroupSettingByName(String enterpriseId, String groupName){
-        List<TabHaobanHmGroupSetting> tabHaobanHmGroupSettings = haobanHmGroupSettingMapper.queryHmGroupSettingByName(enterpriseId, groupName);
+    public List<HmGroupSettingBO> queryGroupSettingByName(String wxEnterpriseId, String enterpriseId, String groupName){
+        List<TabHaobanHmGroupSetting> tabHaobanHmGroupSettings = haobanHmGroupSettingMapper.queryHmGroupSettingByName(wxEnterpriseId, enterpriseId, groupName);
         if (CollectionUtils.isEmpty(tabHaobanHmGroupSettings)){
             return Collections.emptyList();
         }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmGroupApiServiceImpl.java

@@ -69,7 +69,7 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
         if (StringUtils.equals(DEFAULT_GROUP_NAME, hmGroupDTO.getGroupName())) {
             return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", "分组名称不能重复");
         }
-        List<HmGroupSettingBO> groupSettingBos = groupService.queryGroupSettingByName(hmGroupDTO.getEnterpriseId(), hmGroupDTO.getGroupName());
+        List<HmGroupSettingBO> groupSettingBos = groupService.queryGroupSettingByName(hmGroupDTO.getWxEnterpriseId(), hmGroupDTO.getEnterpriseId(), hmGroupDTO.getGroupName());
         if (hmGroupDTO.getGroupId() == null) {
             // insert
             // check groupName unique
@@ -240,8 +240,8 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
      * @return
      */
     @Override
-    public ServiceResponse<List<HmGroupDTO>> queryGroupListByName(String enterpriseId, String groupName) {
-        List<HmGroupSettingBO> hmGroupSettingBos = groupService.queryGroupSettingByName(enterpriseId, groupName);
+    public ServiceResponse<List<HmGroupDTO>> queryGroupListByName(String wxEnterpriseId, String enterpriseId, String groupName) {
+        List<HmGroupSettingBO> hmGroupSettingBos = groupService.queryGroupSettingByName(wxEnterpriseId, enterpriseId, groupName);
         return ServiceResponse.success(EntityUtil.changeEntityListByOrika(HmGroupDTO.class, hmGroupSettingBos));
     }
 }

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmGroupSettingMapper.xml

@@ -210,6 +210,7 @@
         from tab_haoban_hm_group_setting
         where group_name = #{groupName}
         and enterprise_id = #{enterpriseId}
+        and wx_enterprise_id = #{wxEnterpriseId}
         and `status` = 1
     </select>
 </mapper>
\ No newline at end of file

haoban-manage3-service/src/test/java/HmPageServiceTest.java

@@ -137,7 +137,7 @@ public class HmPageServiceTest {
 
     @Test
     public void groupNameCheckTest(){
-        ServiceResponse<List<HmGroupDTO>> ms = groupService.queryGroupListByName("ff8080815dacd3a2015dacd3ef5c0000", "测试006");
+        ServiceResponse<List<HmGroupDTO>> ms = groupService.queryGroupListByName("", "ff8080815dacd3a2015dacd3ef5c0000", "测试006");
         System.out.println(JSON.toJSONString(ms));
     }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmGroupController.java

@@ -143,7 +143,7 @@ public class HmGroupController extends WebBaseController {
         if (StringUtils.isBlank(groupSettingVO.getGroupName())){
             return RestResponse.successResult(Collections.emptyList());
         }
-        ServiceResponse<List<HmGroupDTO>> serviceResponse = groupApiService.queryGroupListByName(loginUser.getEnterpriseId(), groupSettingVO.getGroupName());
+        ServiceResponse<List<HmGroupDTO>> serviceResponse = groupApiService.queryGroupListByName(loginUser.getWxEnterpriseId(), loginUser.getEnterpriseId(), groupSettingVO.getGroupName());
         if (serviceResponse.isSuccess()){
             return RestResponse.successResult(serviceResponse.getResult());
         }