【市一】登录bug处理

陈昶聿

5 天以前 861b8c51cf42864fde663391eeb73e4fc61d3848

【市一】登录bug处理

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java

@@ -3,6 +3,7 @@
import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
import com.aliyun.teaopenapi.models.Config;
import com.github.pagehelper.ISelect;
import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java

@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;

import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -2,6 +2,8 @@

import java.util.List;
import javax.servlet.http.HttpServletResponse;

import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -2,6 +2,7 @@

import java.util.List;

import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -3,6 +3,8 @@
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;

import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -2,6 +2,8 @@

import java.util.List;
import javax.servlet.http.HttpServletResponse;

import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -2,6 +2,7 @@

import java.util.List;

import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java

@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;

import com.ruoyi.common.annotation.AddOrgId;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -53,7 +53,7 @@
     * @param userName 用户名
     * @return 用户对象信息
     */
    public SysUser selectUserByUserNameByCondition(@Param("userName") String userName, @Param("deptId") String deptId);
    public SysUser selectUserByUserNameByCondition(@Param("userName") String userName, @Param("orgid") String orgid, @Param("deptId") String deptId);

    /**
     * 通过用户ID查询用户

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -178,7 +178,7 @@
    @Override
    public SysUser selectUserByUserName2(String userName) {
        String[] split = userName.split("&");
        SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], null);
        SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], null);

        //获取当前登陆人的机构和院区
        SysUserOrg sysUserOrg = new SysUserOrg();
@@ -298,7 +298,7 @@
        if (split[2].contains("null")) {
            split[2] = null;
        }
        SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[2]);
        SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], split[2]);

        //获取当前登陆人的机构和院区
        SysUserOrg sysUserOrg = new SysUserOrg();

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -306,6 +306,9 @@
            <if test="userName != null and userName != ''">
                AND u.user_name = #{userName}
            </if>
            <if test="orgid != null and orgid != ''">
                AND u.orgid = #{orgid}
            </if>
            <if test="deptId != null and deptId != ''">
                AND u.dept_id = #{deptId}
            </if>