绑定手机号

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/mapper/RoleMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
 @MyBatisMapper
 public interface RoleMapper extends BaseMapper<Role> {
 
-    @Select("select r.id, r.code, r.name from role left join user_role ur " +
+    @Select("select r.id, r.code, r.name from role r left join user_role ur " +
             "on r.id = ur.role_id " +
             "where ur.user_id = #{userId} " +
             "and r.code = #{roleCode}")

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/LoginService.java

@@ -369,6 +369,8 @@ public class LoginService implements ILoginService {
         MaintenanceCompany maintenanceCompany = userResponse.getMaintenanceCompany();
         if (maintenanceCompany != null) {
             currentUserInfoMap.put(ApiConstants.CURRENT_COMPANY_ID, maintenanceCompany.getId());
+        } else {
+            currentUserInfoMap.put(ApiConstants.CURRENT_COMPANY_ID, 0L);
         }
         //当前角色id
         Role role = userResponse.getRole();