|
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.aliyuncs.exceptions.ClientException;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -24,6 +25,7 @@ import org.jeecg.modules.base.service.BaseCommonService;
|
|
|
import org.jeecg.modules.system.entity.SysDepart;
|
|
|
import org.jeecg.modules.system.entity.SysRoleIndex;
|
|
|
import org.jeecg.modules.system.entity.SysUser;
|
|
|
+import org.jeecg.modules.system.mapper.SysDepartMapper;
|
|
|
import org.jeecg.modules.system.model.SysLoginModel;
|
|
|
import org.jeecg.modules.system.service.*;
|
|
|
import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
|
|
@@ -65,6 +67,8 @@ public class LoginController {
|
|
|
private BaseCommonService baseCommonService;
|
|
|
@Autowired
|
|
|
private JeecgBaseConfig jeecgBaseConfig;
|
|
|
+ @Resource
|
|
|
+ private SysDepartMapper sysDepartMapper;
|
|
|
|
|
|
private final String BASE_CHECK_CODES = "qwertyuiplkjhgfdsazxcvbnmQWERTYUPLKJHGFDSAZXCVBNM1234567890";
|
|
|
|
|
@@ -188,6 +192,7 @@ public class LoginController {
|
|
|
if(oConvertUtils.isNotEmpty(username)) {
|
|
|
// 根据用户名查询用户信息
|
|
|
SysUser sysUser = sysUserService.getUserByName(username);
|
|
|
+ sysUser.setOrgType(sysDepartMapper.selectOne(Wrappers.<SysDepart>lambdaQuery().eq(SysDepart::getOrgCode, sysUser.getOrgCode())).getOrgCategory());
|
|
|
JSONObject obj=new JSONObject();
|
|
|
log.info("1 获取用户信息耗时(用户基础信息)" + (System.currentTimeMillis() - start) + "毫秒");
|
|
|
|