登录

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

@@ -256,6 +256,7 @@ public class LoginController extends WebBaseController {
             logger.info("查询staff表不存在,gicEnterpriseId:{},loginPhoneNumber={}", gicEnterpriseId);
             return "1002" ;
         }
+        webLoginDTO.setPhoneNumber(loginPhoneNumber);
         webLoginDTO.setHanbaoUserId(hbUser.getUserId());
         webLoginDTO.setWxEnterpriseId(wxEnterpriseId);
         webLoginDTO.setEnterpriseId(gicEnterpriseId);

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

@@ -443,9 +443,13 @@ public class WxEnterpriseController extends WebBaseController {
         }
     }
 
-    private String getWxUserId(String wxEnterpriseId, WebLoginDTO loginStaffDTO) {
-        if (loginStaffDTO != null && (!StringUtils.isEmpty(loginStaffDTO.getWxUserId()))) {
-            return loginStaffDTO.getWxUserId();
+    private String getWxUserId(String wxEnterpriseId, WebLoginDTO loginDTO) {
+        if (loginDTO != null && (!StringUtils.isEmpty(loginDTO.getStaffId()))) {
+            String staffId = loginDTO.getStaffId() ;
+            StaffDTO dto = this.staffApiService.selectById(staffId) ;
+            if(null != dto && StringUtils.isNotBlank(dto.getStaffId())) {
+                return dto.getWxUserId();
+            }
         }
         StaffDTO staffOne = staffApiService.getWxStaffOne(wxEnterpriseId);
         return staffOne.getWxUserId();

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/WebLoginVO.java

@@ -8,7 +8,6 @@ public class WebLoginVO implements Serializable {
 
     private String wxEnterpriseId;
     private String enterpriseId;
-    private Integer wxEnterpriseType;
     // yw / gic
     private String loginChannel = "gic" ;
     private String clerkId;
@@ -93,14 +92,6 @@ public class WebLoginVO implements Serializable {
         this.loginChannel = loginChannel;
     }
 
-    public Integer getWxEnterpriseType() {
-        return wxEnterpriseType;
-    }
-
-    public void setWxEnterpriseType(Integer wxEnterpriseType) {
-        this.wxEnterpriseType = wxEnterpriseType;
-    }
-
     public String getWxEnterpriseId() {
         return wxEnterpriseId;
     }

haoban-manage3-web/src/main/webapp/WEB-INF/spring-interceptor.xml

@@ -5,7 +5,7 @@
     <mvc:interceptors>
         <bean class="com.gic.haoban.common.interceptor.HttpLimitInterceptor"/>
         <bean class="com.gic.commons.interceptor.HeaderTagInterceptor"/>
-        
+        <bean class="com.gic.web.common.inteceptor.RequestInteceptor"></bean>
         <mvc:interceptor>
             <mvc:mapping path="/**"/>
             <mvc:exclude-mapping path="/login.json"/>