Merge branch 'feature-recommend' into 'master'

Feature recommend

See merge request !2783

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

@@ -800,6 +800,9 @@ public class WxEnterpriseInfoController extends WebBaseController {
             return RestResponse.failure("-701", "参数缺失");
         }
         List<EnterpriseUsingPermissionDto> list = enterpriseUseForbidService.selectEnterprisePermissionByEnterpriseId(enterpriseId);
+        if (CollectionUtils.isEmpty(list)) {
+            return RestResponse.successResult(new ArrayList<>());
+        }
         List<EnterpriseUsingPermissionVO> voList = list.stream().map(x -> {
             x.setStatus(x.isUsing() ? 0 : -1);
             return EntityUtil.changeEntityByJSON(EnterpriseUsingPermissionVO.class, x);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/potential/PotentialDataController.java

@@ -230,16 +230,15 @@ public class PotentialDataController {
         if (storeDTO != null) {
             storeId = storeDTO.getStoreId();
         }
-        String clerkTypeStr = "0";
+        String clerkTypeStr = "1";
         CustomerDTO params = new CustomerDTO();
         String clerkId = null;
         if (clerkDTO != null) {
+            clerkTypeStr = "0";
             clerkId = clerkDTO.getClerkId();
             Integer clerkType = clerkDTO.getClerkType();
             if (clerkType == 0 || clerkType == 1) {
                 storeId = clerkDTO.getStoreId();
-            }else {
-                clerkTypeStr = "2";
             }
         }
         ContactParamDTO contact = new ContactParamDTO();