Merge branch 'feature-recommend' into 'developer'

区经类型

See merge request !2779

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

@@ -230,6 +230,7 @@ public class PotentialDataController {
         if (storeDTO != null) {
             storeId = storeDTO.getStoreId();
         }
+        String clerkTypeStr = "0";
         CustomerDTO params = new CustomerDTO();
         String clerkId = null;
         if (clerkDTO != null) {
@@ -237,6 +238,8 @@ public class PotentialDataController {
             Integer clerkType = clerkDTO.getClerkType();
             if (clerkType == 0 || clerkType == 1) {
                 storeId = clerkDTO.getStoreId();
+            }else {
+                clerkTypeStr = "2";
             }
         }
         ContactParamDTO contact = new ContactParamDTO();
@@ -244,8 +247,7 @@ public class PotentialDataController {
         contact.setContactType(0);
         params.setStoreId(storeId);
         params.setClerkId(clerkId);
-        // 只查该导购的
-        params.setClerkType("0");
+        params.setClerkType(clerkTypeStr);
         params.setEnterpriseId(enterpriseId);
         params.setWxEnterpriseId(wxEnterpriseId);
         params.setContactParamDTO(contact);