Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liqin
chnmuseum-party
Commits
e6644b21
Commit
e6644b21
authored
Apr 01, 2021
by
wzp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
772814ed
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
7 deletions
+15
-7
LanguageEnum.java
.../wisenergy/chnmuseum/party/common/enums/LanguageEnum.java
+5
-5
SystemOperationLogService.java
...chnmuseum/party/common/log/SystemOperationLogService.java
+9
-1
TBoxOperationController.java
...nmuseum/party/web/controller/TBoxOperationController.java
+1
-1
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/common/enums/LanguageEnum.java
View file @
e6644b21
...
...
@@ -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
;
...
...
src/main/java/cn/wisenergy/chnmuseum/party/common/log/SystemOperationLogService.java
View file @
e6644b21
...
...
@@ -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");
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoxOperationController.java
View file @
e6644b21
...
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment