Merge remote-tracking branch 'origin/developer' into test_branch

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

@@ -2,12 +2,9 @@ package com.gic.haoban.manage.api.service.hm;
 
 import java.util.List;
 
-import com.gic.api.base.commons.BasePageInfo;
-import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkWxaDTO;
-import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
 
 /**
  * 
@@ -42,8 +39,6 @@ public interface HmLinkApiService {
     public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
             Integer linkType,List<String> creatorIdList);
 
-    //无效接口
-//    public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo);
 
     public ServiceResponse<String> save(HmLinkDTO dto);
 

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

@@ -108,6 +108,9 @@ public class WxEnterpriseActiveDataServiceImpl implements WxEnterpriseActiveData
         if (StrUtil.isBlank(wxEnterpriseId))
             return null;
         StaffActiveDataDTO staffActiveDataDTO = EntityUtil.changeEntityByJSON(StaffActiveDataDTO.class, tabHaobanWxEnterpriseActiveDataMapper.getWxEnterpriseActiveDataByWxEnterpriseId(wxEnterpriseId));
+        if (ObjectUtil.isNull(staffActiveDataDTO)){
+            return null;
+        }
         //查询其他占用许可总数
         Integer occupy=0;
         occupy=staffService.getOccupyNum(wxEnterpriseId);

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

@@ -20,13 +20,10 @@ import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.gic.api.base.commons.BasePageInfo;
-import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.utils.DingUtils;
@@ -38,7 +35,6 @@ import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkStoreSettingDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkWxaDTO;
 import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
-import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
 import com.gic.haoban.manage.api.enums.hm.HmLinkTypeEnum;
 import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
 import com.gic.haoban.manage.service.config.Config;
@@ -179,13 +175,6 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         return ServiceResponse.success(id);
     }
 
-//    @Override
-//    public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo) {
-//        Page<HmLinkBO> page = this.hmLinkService.listPage(qdto, basePageInfo);
-//        Page<HmLinkDTO> resultPage = PageHelperUtils.changePageToCurrentPage(page, HmLinkDTO.class);
-//        return ServiceResponse.success(resultPage);
-//    }
-
     // 群链接
     private ServiceResponse<HmLinkWxaDTO> getLinkChatHmFromWxa(String wxEnterpriseId, String enterpriseId,
             String mixPhone, String unionid, String memberId, HmLinkBO link, HmLinkWxaDTO retDTO) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/target/TargetController.java

@@ -225,7 +225,7 @@ public class TargetController {
         JSONObject jsonObject = getCommon(qo, true);
         Map<String, Object> res = DataTargetHttpUtils.http(DataTargetHttpUtils.getParamNoPage(jsonObject).toJSONString(),
                 "data_mbr_target_store_mbr_631_detail");
-        return DataTargetHttpUtils.response(res);
+        return DataTargetHttpUtils.responseOfOne(res, null);
     }
 
     private JSONObject getCommon(QueryDataStatisticsCommonQO qo, boolean app) {