log

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

@@ -266,6 +266,7 @@ public class LoginController extends WebBaseController {
     @RequestMapping("get-login-info")
     public HaobanResponse getLoginInfo() {
         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) ;

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

 package com.gic.haoban.manage.web.controller;
 
-import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 
@@ -13,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.clerk.api.dto.right.RightMenuDTO;
 import com.gic.clerk.api.service.RightService;
@@ -38,26 +38,19 @@ public class RightController extends WebBaseController {
     private RightService rightService;
 
     @RequestMapping("get-haoban-menu")
-    public HaobanResponse getHaobanMenu(HttpServletRequest request, String enterpriseId) {
+    public HaobanResponse getHaobanMenu(HttpServletRequest request) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        String phoneNumber = login.getPhoneNumber();
-        Enumeration<String>  e= request.getHeaderNames() ;
-        while(e.hasMoreElements()) {
-            String name = e.nextElement() ;
-            String v = request.getHeader(name) ;
-            System.out.println(name  + " = " + v);
-        }
-        if(StringUtils.isBlank(enterpriseId)) {
-            enterpriseId = request.getHeader("enterpriseid") ;
-        }
+        log.info(JSON.toJSONString(login));
+        String enterpriseId = login.getEnterpriseId() ;
+        String clerkId = login.getClerkId() ;
         if(StringUtils.isBlank(enterpriseId)){
             return resultResponse(HaoBanErrCode.ERR_OTHER, "gic商户为空");
         }
-        log.info("好办菜单={},{}", enterpriseId, phoneNumber);
-        if(StringUtils.isEmpty(phoneNumber)) {
-            return resultResponse(HaoBanErrCode.ERR_OTHER, "员工手机号为空");
+        log.info("好办菜单={},{}", enterpriseId, clerkId);
+        if(StringUtils.isEmpty(clerkId)) {
+            return resultResponse(HaoBanErrCode.ERR_OTHER, "clerkId为空");
         }
-        ServiceResponse<List<RightMenuDTO>> resp = this.rightService.getHaobanMenu(enterpriseId, phoneNumber);
+        ServiceResponse<List<RightMenuDTO>> resp = this.rightService.getHaobanMenu(enterpriseId, clerkId);
         if (resp.isSuccess()) {
             return resultResponse(HaoBanErrCode.ERR_1, resp.getResult());
         }
@@ -65,21 +58,19 @@ public class RightController extends WebBaseController {
     }
     
     @RequestMapping("get-haoban-right")
-    public HaobanResponse listHaobanAllMenu(HttpServletRequest request, String enterpriseId) {
+    public HaobanResponse listHaobanAllMenu(HttpServletRequest request) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        String phoneNumber = login.getPhoneNumber();
-        if(StringUtils.isBlank(enterpriseId)) {
-            enterpriseId = request.getHeader("enterpriseid") ;
-        }
+        log.info(JSON.toJSONString(login));
+        String enterpriseId = login.getEnterpriseId() ;
+        String clerkId = login.getClerkId() ;
         if(StringUtils.isBlank(enterpriseId)){
             return resultResponse(HaoBanErrCode.ERR_OTHER, "gic商户为空");
         }
-        log.info("好办菜单={},{}", enterpriseId, phoneNumber);
-        log.info("好办菜单={},{}", enterpriseId, phoneNumber);
-        if(StringUtils.isEmpty(phoneNumber)) {
-            return resultResponse(HaoBanErrCode.ERR_OTHER, "员工手机号为空");
+        log.info("好办菜单={},{}", enterpriseId, clerkId);
+        if(StringUtils.isEmpty(clerkId)) {
+            return resultResponse(HaoBanErrCode.ERR_OTHER, "clerkId为空");
         }
-        ServiceResponse<Map<String,Object>> resp = this.rightService.listHaobanAllMenu(enterpriseId, phoneNumber);
+        ServiceResponse<Map<String,Object>> resp = this.rightService.listHaobanAllMenu(enterpriseId, clerkId);
         if (resp.isSuccess()) {
             return resultResponse(HaoBanErrCode.ERR_1, resp.getResult());
         }