登录

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/HaobanUserApiService.java

@@ -32,5 +32,7 @@ public interface HaobanUserApiService {
     public HaobanUserDTO selectByPhone(String wxEnterpriseId, String phone);
 
     public void updateDefaultGicEid(String userId, String gicEnterpriseId);
+    
+    public HaobanUserDTO selectById(String userId) ;
 
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanUserMapper.java

@@ -36,4 +36,6 @@ public interface TabHaobanUserMapper {
 
     void updateDefaultGicEid(@Param("userId") String userId, @Param("gicEid") String gicEid);
 
+    public TabHaobanUser selectById(@Param("userId") String userId);
+
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/HaobanUserService.java

@@ -32,5 +32,7 @@ public interface HaobanUserService {
 	public HaobanUserDTO selectByPhone(String wxEnterpriseId , String phone) ;
 
     public void updateDefaultGicEid(String userId, String gicEnterpriseId);
+
+    public HaobanUserDTO selectById(String userId);
 	
 }
\ No newline at end of file

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

@@ -50,4 +50,13 @@ public class HaobanUserServiceImpl implements HaobanUserService {
     public void updateDefaultGicEid(String staffid, String gicEnterpriseId) {
         this.tabHaobanUserMapper.updateDefaultGicEid(staffid, gicEnterpriseId);
     }
+    
+    @Override
+    public HaobanUserDTO selectById(String userId) {
+        TabHaobanUser user = this.tabHaobanUserMapper.selectById(userId);
+        if (null != user) {
+            return EntityUtil.changeEntity(HaobanUserDTO.class, user);
+        }
+        return null;
+    }
 }

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

@@ -27,4 +27,9 @@ public class HaobanUserApiServiceImpl implements HaobanUserApiService {
     public void updateDefaultGicEid(String userId, String gicEnterpriseId) {
         this.haobanUserService.updateDefaultGicEid(userId, gicEnterpriseId);
     }
+    
+    @Override
+    public HaobanUserDTO selectById(String userId) {
+        return this.haobanUserService.selectById(userId);
+    }
 }

haoban-manage3-service/src/main/resources/mapper/TabHaobanUserMapper.xml

@@ -51,4 +51,8 @@
   SELECT * FROM tab_haoban_user WHERE wx_enterprise_id=#{wxEnterpriseId} and phone_number=#{phone}
   </select>
   
+  <select id="selectById"  resultMap="result-map-tabHaobanUser">
+  	SELECT * FROM tab_haoban_user WHERE user_id=#{userId} 
+  </select>
+  
 </mapper> 
\ No newline at end of file

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

@@ -247,6 +247,7 @@ public class LoginController extends WebBaseController {
         HaobanUserDTO hbUser = new HaobanUserDTO() ;
         hbUser.setWxEnterpriseId(wxEnterpriseId);
         hbUser.setPhoneNumber(loginPhoneNumber);
+        hbUser.setDefaultGicEid(gicEnterpriseId);
         hbUser = this.haobanUserApiService.insert(hbUser) ;
         if(hbUser==null) {
             logger.info("查询staff表不存在,gicEnterpriseId:{},loginPhoneNumber={}", gicEnterpriseId);

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

@@ -3,7 +3,6 @@ package com.gic.haoban.manage.web.controller;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -41,18 +40,19 @@ import com.gic.haoban.manage.api.dto.AgentEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.BindStoreInfoDTO;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
+import com.gic.haoban.manage.api.dto.HaobanUserDTO;
 import com.gic.haoban.manage.api.dto.MaterialDTO;
 import com.gic.haoban.manage.api.dto.MiniprogramSettingDTO;
 import com.gic.haoban.manage.api.dto.SecretSettingDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StoreOrGroupInfoDTO;
-import com.gic.haoban.manage.api.dto.WelcomeDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseRelationDetailDTO;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
+import com.gic.haoban.manage.api.service.HaobanUserApiService;
 import com.gic.haoban.manage.api.service.MaterialApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
@@ -100,6 +100,8 @@ public class WxEnterpriseController extends WebBaseController {
     private MaterialApiService materialApiService;
     @Autowired
     private AuthorizeService authorizeService;
+    @Autowired
+    private HaobanUserApiService haobanUserApiService ;
 
     //授权企业列表
     @RequestMapping("wxa-enterprise-list")
@@ -137,8 +139,8 @@ public class WxEnterpriseController extends WebBaseController {
         String wxEnterpriseId = login.getWxEnterpriseId();
         String phoneNumber = login.getPhoneNumber() ;
         List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId,phoneNumber,filteRight==1);
-        String staffId = login.getStaffId() ;
-        StaffDTO dto =  this.staffApiService.selectById(staffId) ;
+        String userId = login.getHanbaoUserId() ;
+        HaobanUserDTO dto =  this.haobanUserApiService.selectById(userId) ;
         String eid = dto.getDefaultGicEid() ;
         for(EnterpriseDetailDTO item : list) {
             if(null != eid && eid.equals(item.getEnterpriseId())) {

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

@@ -24,7 +24,6 @@ public class WebLoginVO implements Serializable {
     // 企业用户id(密文)
     private String wxOpenUseId;
     private String headImg ;
-    private StaffVO staffVO ;
 
     public Integer getSuperAdmin() {
         return superAdmin;
@@ -50,14 +49,6 @@ public class WebLoginVO implements Serializable {
         this.headImg = headImg;
     }
 
-    public StaffVO getStaffVO() {
-        return staffVO;
-    }
-
-    public void setStaffVO(StaffVO staffVO) {
-        this.staffVO = staffVO;
-    }
-
     public String getStaffName() {
         return staffName;
     }