|
@@ -1,22 +1,13 @@
|
|
|
package org.jeecg.modules.system.service.impl;
|
|
|
|
|
|
-import java.sql.Connection;
|
|
|
-import java.sql.DatabaseMetaData;
|
|
|
-import java.sql.SQLException;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-
|
|
|
-import javax.annotation.Resource;
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
-import javax.sql.DataSource;
|
|
|
-
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
import org.jeecg.common.constant.CacheConstant;
|
|
|
import org.jeecg.common.constant.CommonConstant;
|
|
@@ -29,7 +20,6 @@ import org.jeecg.common.util.SpringContextUtils;
|
|
|
import org.jeecg.common.util.SysAnnmentTypeEnum;
|
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
import org.jeecg.common.util.oss.OssBootUtil;
|
|
|
-import org.jeecg.modules.activiti.entity.TbTableInfo;
|
|
|
import org.jeecg.modules.message.entity.SysMessageTemplate;
|
|
|
import org.jeecg.modules.message.service.ISysMessageTemplateService;
|
|
|
import org.jeecg.modules.message.websocket.WebSocket;
|
|
@@ -38,18 +28,25 @@ import org.jeecg.modules.system.mapper.*;
|
|
|
import org.jeecg.modules.system.service.ISysDataSourceService;
|
|
|
import org.jeecg.modules.system.service.ISysDepartService;
|
|
|
import org.jeecg.modules.system.service.ISysDictService;
|
|
|
+import org.jeecg.modules.system.service.ISysPositionService;
|
|
|
import org.jeecg.modules.system.util.MinioUtil;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
-
|
|
|
-import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
+import javax.sql.DataSource;
|
|
|
+import java.sql.Connection;
|
|
|
+import java.sql.DatabaseMetaData;
|
|
|
+import java.sql.SQLException;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
+
|
|
|
|
|
|
* @Description: 底层共通业务API,提供其他独立模块调用
|
|
|
* @Author: scott
|
|
@@ -88,6 +85,8 @@ public class SysBaseApiImpl implements ISysBaseAPI {
|
|
|
|
|
|
@Autowired
|
|
|
private ISysDataSourceService dataSourceService;
|
|
|
+ @Autowired
|
|
|
+ private ISysPositionService positionService;
|
|
|
|
|
|
@Override
|
|
|
public void addLog(String LogContent, Integer logType, Integer operatetype) {
|
|
@@ -133,6 +132,10 @@ public class SysBaseApiImpl implements ISysBaseAPI {
|
|
|
return null;
|
|
|
}
|
|
|
BeanUtils.copyProperties(sysUser, loginUser);
|
|
|
+ SysPosition position = positionService.getOne(new LambdaQueryWrapper<SysPosition>().eq(SysPosition::getCode, sysUser.getPost()));
|
|
|
+ if (position != null) {
|
|
|
+ loginUser.setPostName(position.getName());
|
|
|
+ }
|
|
|
return loginUser;
|
|
|
}
|
|
|
|