login

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

@@ -213,11 +213,6 @@ public class LoginController extends WebBaseController {
     // 登录逻辑
     private String doLogin(String wxEnterpriseId, String gicEnterpriseId, String loginPhoneNumber, String loginChannel,
             HttpServletResponse response) {
-        /*StaffDTO staff = staffApiService.selectByNationcodeAndPhoneNumber(wxEnterpriseId, "86", loginPhoneNumber);
-        if (null == staff) {
-            logger.info("查询staff表不存在,gicEnterpriseId:{},loginPhoneNumber={}", gicEnterpriseId);
-            return "1002" ;
-        }*/
         WxApplicationDTO application = wxApplicationApiService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId,2);
         if (null == application) {
             logger.info("登录企业应用 没授权!gicEnterpriseId:{}", gicEnterpriseId);
@@ -228,6 +223,17 @@ public class LoginController extends WebBaseController {
             logger.info("登录失败,微信企业不存在=wxEnterpriseId{}", wxEnterpriseId);
             return "1000";
         }
+        
+        WebLoginDTO webLoginDTO = new WebLoginDTO() ;
+        StaffDTO staff = staffApiService.selectByNationcodeAndPhoneNumber(wxEnterpriseId, "86", loginPhoneNumber);
+        if (null == staff) {
+            logger.info("查询staff表不存在,gicEnterpriseId:{},loginPhoneNumber={}", gicEnterpriseId);
+           // return "1002" ;
+        }else {
+            webLoginDTO = EntityUtil.changeEntityByJSON(WebLoginDTO.class, staff);
+        }
+        webLoginDTO.setWxEnterpriseId(wxEnterpriseId);
+        webLoginDTO.setEnterpriseId(gicEnterpriseId);
         // 导购id
         ClerkDTO clerk = clerkService.getUserByPhoneNumber(loginPhoneNumber, gicEnterpriseId);
         if (clerk == null) {
@@ -235,9 +241,6 @@ public class LoginController extends WebBaseController {
             return "1003";
         }
         EnterpriseDTO en = this.enterpriseService.getEnterpriseById(gicEnterpriseId) ;
-        WebLoginDTO webLoginDTO = new WebLoginDTO() ;
-        webLoginDTO.setWxEnterpriseId(wxEnterpriseId);
-        webLoginDTO.setEnterpriseId(gicEnterpriseId);
         webLoginDTO.setLoginChannel(loginChannel);
         webLoginDTO.setClerkId(clerk.getClerkId());
         webLoginDTO.setClerkName(clerk.getClerkName());
@@ -285,11 +288,6 @@ public class LoginController extends WebBaseController {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         logger.info("当前登录信息={}",JSON.toJSON(loginUser));
         WebLoginVO vo = EntityUtil.changeEntityByOrika(WebLoginVO.class, loginUser) ;
-        String staffId = loginUser.getStaffId() ;
-        StaffDTO dto = this.staffApiService.selectById(staffId) ;
-        vo.setStaffName(dto.getStaffName()+"("+loginUser.getClerkName()+")");
-        StaffVO staffVO = EntityUtil.changeEntityByOrika(StaffVO.class, dto) ;
-        vo.setStaffVO(staffVO);
         return this.success(vo) ;
     }