login

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

@@ -27,6 +27,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.dto.PowerClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
+import com.gic.clerk.api.service.RightService;
 import com.gic.clerk.api.service.UserService;
 import com.gic.commons.util.ToolUtil;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
@@ -83,6 +84,8 @@ public class LoginController extends WebBaseController {
     private EnterpriseService enterpriseService;
     @Autowired
     private HaobanUserApiService haobanUserApiService;
+    @Autowired
+    private RightService rightService ;
 
     /**
      * 企微后台登录
@@ -265,7 +268,8 @@ public class LoginController extends WebBaseController {
         EnterpriseDTO en = this.enterpriseService.getEnterpriseById(gicEnterpriseId) ;
         webLoginDTO.setLoginChannel(loginChannel);
         webLoginDTO.setClerkId(clerk.getClerkId());
-        webLoginDTO.setRoleId(clerk.getRoleId());
+        String roleId = this.rightService.getRoleIdByClerkId(clerk.getClerkId()) ;
+        webLoginDTO.setRoleId(roleId);
         webLoginDTO.setClerkName(clerk.getClerkName());
         webLoginDTO.setBrandName(en.getBrandName());
         webLoginDTO.setSuperAdmin(clerk.getSuperAdmin());
@@ -349,7 +353,8 @@ public class LoginController extends WebBaseController {
         loginUser.setClerkId(clerk.getClerkId());
         loginUser.setClerkName(clerk.getClerkName());
         loginUser.setSuperAdmin(clerk.getSuperAdmin());
-        loginUser.setRoleId(clerk.getRoleId());
+        String roleId = this.rightService.getRoleIdByClerkId(clerk.getClerkId()) ;
+        loginUser.setRoleId(roleId);
         loginUser.setDepartAuth(clerk.getDepartAuth());
         loginUser.setBrandName(enterprise.getBrandName());
         AuthWebRequestUtil.setSessionUser(loginUser);