Commit e6644b21 authored by wzp's avatar wzp

修改bug

parent 772814ed
......@@ -2,11 +2,11 @@ package cn.wisenergy.chnmuseum.party.common.enums;
public enum LanguageEnum {
CHINESE("Chinese", "汉语"),
MONGOLIAN("Mongolian", "蒙语"),
TIBETAN("Tibetan", "藏语"),
UYGHUR("Uyghur", "维吾尔语"),
ENGLISH("English", "英语");
zh("Chinese", "汉语"),
mn("Mongolian", "蒙语"),
bo("Tibetan", "藏语"),
uyg("Uyghur", "维吾尔语"),
en("English", "英语");
// 错误编码
private String code;
......
......@@ -89,7 +89,15 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
.getRequestAttributes()).getRequest();
MethodLog methodLog = getAnnotationLog(point);
String ip = getIp(request);
TUser user = getCurAdmin(request);
TUser user = null;
try {
user = getCurAdmin(request);
} catch (Exception e) {
HashMap<Object, Object> resultMap = new HashMap<>();
resultMap.put("resultCode", "500");
resultMap.put("message", "token失效");
return resultMap;
}
// if (user==null){
// HashMap<String, Object> resultMap = new HashMap<>();
// resultMap.put("resultCode", "500");
......
......@@ -64,7 +64,7 @@ public class TBoxOperationController extends BaseController {
//设置数据权限
if (StringUtils.isNotBlank(user1.getAreaId())) {
String areaId1 = getAreaId(user1.getAreaId());
user.setAreaName(getAreaId(areaId1));
user.setAreaName(areaId1);
}
user.setOrgCode(user1.getOrgCode());
try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment