登陆校验

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

@@ -181,14 +181,22 @@ public class InfoController extends WebBaseController{
 
     @RequestMapping("get-user-by-member-code")
     public HaobanResponse getInfoByMemberCode(GetUserByMemberCodeQo qo) {
-        //todo 销售线索 获取当前wxEnterpriseId
-        List<WxEnterpriseDTO> wxEnterpriseDTOS = wxEnterpriseRelatedApiService.listWxEnterpriseByEid(qo.getGicEnterpriseId());
 
-        if (CollectionUtils.isEmpty(wxEnterpriseDTOS)) {
-            logger.info("改企业没有关系好办:{}", qo.getGicEnterpriseId());
-            return resultResponse(HaoBanErrCode.ERR_500001);
+        WxEnterpriseDTO enterpriseDetailDTO = null;
+        if (StringUtils.isBlank(qo.getCorpId())) {
+            enterpriseDetailDTO = wxEnterpriseApiService.getEnterpriseBycorpId(qo.getCorpId());
+            if (null == enterpriseDetailDTO) {
+                logger.info("改企业没有关系好办1:{}", qo.getGicEnterpriseId());
+                return resultResponse(HaoBanErrCode.ERR_500001);
+            }
+        } else {
+            List<WxEnterpriseDTO> wxEnterpriseDTOS = wxEnterpriseRelatedApiService.listWxEnterpriseByEid(qo.getGicEnterpriseId());
+            if (CollectionUtils.isEmpty(wxEnterpriseDTOS)) {
+                logger.info("改企业没有关系好办:{}", qo.getGicEnterpriseId());
+                return resultResponse(HaoBanErrCode.ERR_500001);
+            }
+            enterpriseDetailDTO = wxEnterpriseDTOS.get(0);
         }
-        WxEnterpriseDTO enterpriseDetailDTO = wxEnterpriseDTOS.get(0);
 
         WxEnterpriseDTO enterpriseDTO = wxEnterpriseApiService.getOne(enterpriseDetailDTO.getWxEnterpriseId());
         if (enterpriseDTO == null) {
@@ -198,18 +206,9 @@ public class InfoController extends WebBaseController{
 
         MemberLoginQo user = new MemberLoginQo();
         if (StringUtils.isBlank(qo.getUserId())) {
-//            SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(enterpriseDetailDTO.getWxEnterpriseId(), SecretTypeEnum.MEMBER_WAPP.getVal(), qo.getGicEnterpriseId());
-//            if (null == secretSetting||StringUtils.isBlank(secretSetting.getSecretVal())) {
-//                return resultResponse(HaoBanErrCode.ERR_10019);
-//            }
-//
-//        	logger.info("corpId============>{},secretVal===============>{},code=================》{}",enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), qo.getCode());
-//            String userDTOJson = qywxUserApiService.getUserByCode(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), qo.getCode());
             user = getUserByCode(enterpriseDTO, qo.getCode(), qo.getGicEnterpriseId());
-
             if (user != null && (!user.getCorpId().equals(enterpriseDTO.getCorpid()))) {
-                WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getEnterpriseBycorpId(user.getCorpId());
-                user = getUserByCode(enterpriseDTO, qo.getCode(), qo.getGicEnterpriseId());
+                return resultResponse(HaoBanErrCode.ERR_500003, user.getCorpId());
             }
             if (user == null) {
                 return resultResponse(HaoBanErrCode.ERR_6);

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

@@ -186,6 +186,7 @@ public enum HaoBanErrCode {
     ERR_200002(200002, "非当前登录企业员工"),
 
     ERR_500001(500001, "该企业没关联好办"),
+    ERR_500003(500003, "企业corpid不对应，需要重新登录传code"),
     ERR_600001(600001, "成员不存在,请联系管理员后台授权通讯录权限"),
     ERR_600002(600002, "无手机号"),
     

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/GetUserByMemberCodeQo.java

@@ -13,6 +13,16 @@ public class GetUserByMemberCodeQo implements Serializable {
     private String userId;
     private String openid;
     private String memberId;
+    //企业微信id 如果传了需要根据这个corpId来获取用户
+    private String corpId;
+
+    public String getCorpId() {
+        return corpId;
+    }
+
+    public void setCorpId(String corpId) {
+        this.corpId = corpId;
+    }
 
     public String getCode() {
         return code;