fix：鸿星尔克定制

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

@@ -129,7 +129,7 @@ public class MessageApiServiceImpl implements MessageApiService {
         log.info("【成员部门同步回调处理】dto={}", JSON.toJSONString(param));
         String suiteId = dto.getSuiteId();
         if (!SELF_APP.equals(suiteId)) {
-            log.info("通讯录只处理自建应用回调 dto={}",JSON.toJSONString(param));
+            log.info("通讯录只处理自建应用回调 dto={}", JSON.toJSONString(param));
             return;
         }
         //处理部门
@@ -192,10 +192,23 @@ public class MessageApiServiceImpl implements MessageApiService {
         Map<Integer, com.gic.wechat.api.dto.qywx.DepartmentDTO> departmentIdMap = departments.stream()
                 .collect(Collectors.toMap(com.gic.wechat.api.dto.qywx.DepartmentDTO::getId, Function.identity(), (a, b) -> a));
         com.gic.wechat.api.dto.qywx.DepartmentDTO mainDept = departmentIdMap.get(Integer.valueOf(mainDeptId));
-        clerkQwDTO.setStoreName(mainDept.getName());
+        String deptName = mainDept.getName();
+        clerkQwDTO.setStoreName(deptName);
         clerkQwDTO.setClerkCode(dto.getUserid());
         clerkQwDTO.setClerkName(staffName);
-        clerkQwDTO.setClerkType(dto.getIsLeaderInDept()[0]);
+        Integer isLeaderInDept = dto.getIsLeaderInDept()[0];
+        log.info("是否是部门负责人：isLeaderInDept:{}", isLeaderInDept);
+        //是否是部门负责人
+        if (isLeaderInDept == 1) {
+            clerkQwDTO.setClerkType(1);
+        } else {
+            log.info("部门名称：deptName:{}", deptName);
+            if (deptName.contains("店长")) {
+                clerkQwDTO.setClerkType(1);
+            } else {
+                clerkQwDTO.setClerkType(0);
+            }
+        }
         clerkQwDTO.setClerkGener(dto.getGender());
         clerkQwDTO.setPhoneNumber(dto.getMobile());
         clerkQwDTO.setNationcode(dto.getTelephone());

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

@@ -7,7 +7,6 @@ import com.gic.haoban.common.utils.CheckSmsCodeUtil;
 import com.gic.haoban.common.utils.GooglePhoneNumberUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.communicate.api.service.valid.ValidationCodeService;
-import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.reponse.SendSmsResponse;
@@ -21,14 +20,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 public class SendCodeController extends WebBaseController{
-	
-	
 	private static Logger logger = LoggerFactory.getLogger(SendCodeController.class);
 	
 	@Autowired
-	private StaffApiService staffApiService;
-	
-	@Autowired
 	private ValidationCodeService validationCodeService;
 
     @Autowired
@@ -66,15 +60,6 @@ public class SendCodeController extends WebBaseController{
            RedisUtil.setCache(cacheKey, true, 60L);
        }
 
-
-        //绑定
-        if (type == 1) {
-//            StaffDTO staffDTO = staffApiService.selectByNationcodeAndPhoneNumber(wxEnterpriseId, nationcode, phoneNumber);
-//            if (staffDTO == null) {
-//                logger.info("用户不存在:{}-{}", nationcode,phoneNumber);
-//                return resultResponse(HaoBanErrCode.ERR_8);
-//            }
-        }
         String smsCode = "";
         if(CheckSmsCodeUtil.getCacheSmsCode(nationcode+"-"+phoneNumber, type) != null){
         	smsCode = (String)CheckSmsCodeUtil.getCacheSmsCode(nationcode+"-"+phoneNumber, type);