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

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/AppPageType.java

@@ -34,9 +34,9 @@ public enum AppPageType {
     FACE_ARRIVAL(14, "hbapp_customer_bind_faceId"),
     //完善标签
     PERFECT_TAG(15, "hbapp_customer_edit_tag"),
-    //销售线索任务列表
-    MARKET_CLUE_TASK(16, "hbapp_sales_lead_main"),
-    //话务任务逾期提醒
+    //销售线索任务列表（hbapp_sales_lead_main废弃，改为新的hbapp_marketing_task_list）
+    MARKET_CLUE_TASK(16, "hbapp_marketing_task_list"),
+    //话务任务
     TEL_WITHIN_TIME_LIMIT(17, "hbapp_marketing_task_list"),
     ;
 

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

@@ -112,10 +112,12 @@ public class AuditController extends WebBaseController {
         List<StaffClerkBindLogDetailDTO> list = page.getResult();
         List<StaffClerkBindLogDetailVO> voList = new ArrayList<StaffClerkBindLogDetailVO>();
         for (StaffClerkBindLogDetailDTO staffClerkBindLogDetailDTO : list) {
+            if (staffClerkBindLogDetailDTO.getChannelCode() != ChannelCodeEnum.AUDIT_BIND.getCode()) {
                 StaffClerkBindLogDetailVO vo = EntityUtil.changeEntityByJSON(StaffClerkBindLogDetailVO.class, staffClerkBindLogDetailDTO);
                 vo.setUnbindReason(ChannelCodeEnum.getNameByCode(vo.getChannelCode()));
                 voList.add(vo);
             }
+        }
         Page<StaffClerkBindLogDetailVO> pageVO = new Page<>();
         pageVO.setCurrentPage(page.getCurrentPage());
         pageVO.setPageSize(page.getPageSize());

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

@@ -249,12 +249,20 @@ public class ClerkController extends WebBaseController{
 		String nationcode = staffDTO.getNationCode();
 		String postion = staffDTO.getPostion();
 		Integer sex = staffDTO.getSex();
-		if(StringUtils.isAnyBlank(staffName,phoneNumber,commitName)) {
+		if(StringUtils.isAnyBlank(staffName, commitName)) {
 			return resultResponse(HaoBanErrCode.ERR_10004);
 		}
-		if(!GooglePhoneNumberUtil.checkPhoneNumber(phoneNumber, nationcode)){
+		if (StringUtils.isEmpty(clerkCode)) {
+			return resultResponse(HaoBanErrCode.ERR_111116);
+		}
+		if(StringUtils.isNotEmpty(phoneNumber) &&
+				!GooglePhoneNumberUtil.checkPhoneNumber(phoneNumber, nationcode)){
 			return resultResponse(HaoBanErrCode.ERR_10012);
 		}
+		// 导购code校验-字母和数字
+		if (!clerkCode.matches("[a-zA-Z0-9]")) {
+			return resultResponse(HaoBanErrCode.ERR_10023);
+		}
 		if(version == null){
 			StaffDTO staff = staffApiService.selectByNationcodeAndPhoneNumber(wxEnterpriseId,nationcode,phoneNumber);
 			if(staff != null) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -218,6 +218,8 @@ public enum HaoBanErrCode {
 
     ERR_10022(10022, "已有刷新在执行中,请不要重复刷新"),
 
+    ERR_10023(10023, "code格式不正确"),
+
     ERR_11122(11122,"手机号已存在"),
 
     ERR_11123(11123, "请到好办端刷新企业微信好友"),