Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
device-back
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Matrix
device-back
Commits
e56c95f7
提交
e56c95f7
authored
11月 18, 2021
作者:
zjm
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(人员模块): 修改了人员档案的时间排序,以及档案的格式
修改了人员档案的时间排序,以及档案的格式
上级
d501bb10
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
10 行增加
和
8 行删除
+10
-8
UserLogDao.java
...java/com/tykj/dev/device/user/subject/dao/UserLogDao.java
+2
-0
UserLogServiceImpl.java
.../device/user/subject/service/impl/UserLogServiceImpl.java
+1
-1
UserServiceImpl.java
...dev/device/user/subject/service/impl/UserServiceImpl.java
+7
-7
没有找到文件。
dev-user/src/main/java/com/tykj/dev/device/user/subject/dao/UserLogDao.java
浏览文件 @
e56c95f7
...
@@ -9,4 +9,6 @@ import java.util.List;
...
@@ -9,4 +9,6 @@ import java.util.List;
public
interface
UserLogDao
extends
JpaRepository
<
UserLog
,
Integer
>,
JpaSpecificationExecutor
<
UserLog
>
{
public
interface
UserLogDao
extends
JpaRepository
<
UserLog
,
Integer
>,
JpaSpecificationExecutor
<
UserLog
>
{
List
<
UserLog
>
findAllByUserIdOrderByTimeAsc
(
Integer
userId
);
List
<
UserLog
>
findAllByUserIdOrderByTimeAsc
(
Integer
userId
);
List
<
UserLog
>
findAllByUserIdOrderByTimeDesc
(
Integer
userId
);
}
}
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserLogServiceImpl.java
浏览文件 @
e56c95f7
...
@@ -41,6 +41,6 @@ public class UserLogServiceImpl implements UserLogService {
...
@@ -41,6 +41,6 @@ public class UserLogServiceImpl implements UserLogService {
@Override
@Override
public
List
<
UserLog
>
findAllByuserID
(
Integer
userId
)
{
public
List
<
UserLog
>
findAllByuserID
(
Integer
userId
)
{
return
userLogDao
.
findAllByUserIdOrderByTime
A
sc
(
userId
);
return
userLogDao
.
findAllByUserIdOrderByTime
De
sc
(
userId
);
}
}
}
}
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java
浏览文件 @
e56c95f7
...
@@ -178,32 +178,32 @@ public class UserServiceImpl implements UserService {
...
@@ -178,32 +178,32 @@ public class UserServiceImpl implements UserService {
public
User
update
(
User
user
)
{
public
User
update
(
User
user
)
{
User
oldUser
=
userCache
.
findById
(
user
.
getUserId
());
User
oldUser
=
userCache
.
findById
(
user
.
getUserId
());
if
(
user
.
getName
()!=
null
&&!
user
.
getName
().
equals
(
oldUser
.
getName
())){
if
(
user
.
getName
()!=
null
&&!
user
.
getName
().
equals
(
oldUser
.
getName
())){
userLogService
.
save
(
new
UserLog
(
user
.
getUserId
(),
new
Date
(),
"修改信息 名称:"
+(
oldUser
.
getName
()!=
null
?
oldUser
.
getName
()
:
""
)+
"
->
"
+
user
.
getName
()));
userLogService
.
save
(
new
UserLog
(
user
.
getUserId
(),
new
Date
(),
"修改信息 名称:"
+(
oldUser
.
getName
()!=
null
?
oldUser
.
getName
()
:
""
)+
"
改为
"
+
user
.
getName
()));
}
}
if
(
user
.
getMobile
()!=
null
&&!
user
.
getMobile
().
equals
(
oldUser
.
getMobile
())){
if
(
user
.
getMobile
()!=
null
&&!
user
.
getMobile
().
equals
(
oldUser
.
getMobile
())){
userLogService
.
save
(
new
UserLog
(
user
.
getUserId
(),
new
Date
(),
"修改信息 手机号码:"
+(
oldUser
.
getMobile
()!=
null
?
oldUser
.
getMobile
()
:
""
)+
"
->
"
+
user
.
getMobile
()));
userLogService
.
save
(
new
UserLog
(
user
.
getUserId
(),
new
Date
(),
"修改信息 手机号码:"
+(
oldUser
.
getMobile
()!=
null
?
oldUser
.
getMobile
()
:
""
)+
"
改为
"
+
user
.
getMobile
()));
}
}
if
(
user
.
getSex
()!=
null
&&!
user
.
getSex
().
equals
(
oldUser
.
getSex
())){
if
(
user
.
getSex
()!=
null
&&!
user
.
getSex
().
equals
(
oldUser
.
getSex
())){
userLogService
.
save
(
new
UserLog
(
user
.
getUserId
(),
new
Date
(),
"修改信息 性别:"
+(
oldUser
.
getSex
()!=
null
?(
oldUser
.
getSex
()==
0
?
"男"
:
"女"
)
:
""
)+
"
->
"
+(
user
.
getSex
()==
0
?
"男"
:
"女"
)));
userLogService
.
save
(
new
UserLog
(
user
.
getUserId
(),
new
Date
(),
"修改信息 性别:"
+(
oldUser
.
getSex
()!=
null
?(
oldUser
.
getSex
()==
0
?
"男"
:
"女"
)
:
""
)+
"
改为
"
+(
user
.
getSex
()==
0
?
"男"
:
"女"
)));
}
}
if
(
user
.
getPosition
()!=
null
&&!
user
.
getPosition
().
equals
(
oldUser
.
getPosition
())){
if
(
user
.
getPosition
()!=
null
&&!
user
.
getPosition
().
equals
(
oldUser
.
getPosition
())){
userLogService
.
save
(
new
UserLog
(
user
.
getUserId
(),
new
Date
(),
"修改信息 职位:"
+(
oldUser
.
getPosition
()!=
null
?
(
oldUser
.
getPosition
()==
0
?
"领导"
:
"职员"
)
:
""
)+
"
->
"
+(
user
.
getPosition
()==
0
?
"领导"
:
"职员"
)));
userLogService
.
save
(
new
UserLog
(
user
.
getUserId
(),
new
Date
(),
"修改信息 职位:"
+(
oldUser
.
getPosition
()!=
null
?
(
oldUser
.
getPosition
()==
0
?
"领导"
:
"职员"
)
:
""
)+
"
改为
"
+(
user
.
getPosition
()==
0
?
"领导"
:
"职员"
)));
}
}
if
(
user
.
getEmail
()!=
null
&&!
user
.
getEmail
().
equals
(
oldUser
.
getEmail
())){
if
(
user
.
getEmail
()!=
null
&&!
user
.
getEmail
().
equals
(
oldUser
.
getEmail
())){
userLogService
.
save
(
new
UserLog
(
user
.
getUserId
(),
new
Date
(),
"修改信息 邮箱:"
+(
oldUser
.
getEmail
()!=
null
?
oldUser
.
getEmail
()
:
""
)+
"
->
"
+
user
.
getEmail
()));
userLogService
.
save
(
new
UserLog
(
user
.
getUserId
(),
new
Date
(),
"修改信息 邮箱:"
+(
oldUser
.
getEmail
()!=
null
?
oldUser
.
getEmail
()
:
""
)+
"
改为
"
+
user
.
getEmail
()));
}
}
if
(
user
.
getIdCard
()!=
null
&&!
user
.
getIdCard
().
equals
(
oldUser
.
getIdCard
())){
if
(
user
.
getIdCard
()!=
null
&&!
user
.
getIdCard
().
equals
(
oldUser
.
getIdCard
())){
userLogService
.
save
(
new
UserLog
(
user
.
getUserId
(),
new
Date
(),
"修改信息 身份证:"
+(
oldUser
.
getIdCard
()!=
null
?
oldUser
.
getIdCard
():
""
)+
"
->
"
+
user
.
getIdCard
()));
userLogService
.
save
(
new
UserLog
(
user
.
getUserId
(),
new
Date
(),
"修改信息 身份证:"
+(
oldUser
.
getIdCard
()!=
null
?
oldUser
.
getIdCard
():
""
)+
"
改为
"
+
user
.
getIdCard
()));
}
}
if
(
user
.
getTelphone
()!=
null
&&!
user
.
getTelphone
().
equals
(
oldUser
.
getTelphone
())){
if
(
user
.
getTelphone
()!=
null
&&!
user
.
getTelphone
().
equals
(
oldUser
.
getTelphone
())){
userLogService
.
save
(
new
UserLog
(
user
.
getUserId
(),
new
Date
(),
"修改信息 固定电话:"
+(
oldUser
.
getTelphone
()!=
null
?
oldUser
.
getTelphone
():
""
)+
"
->
"
+
user
.
getTelphone
()));
userLogService
.
save
(
new
UserLog
(
user
.
getUserId
(),
new
Date
(),
"修改信息 固定电话:"
+(
oldUser
.
getTelphone
()!=
null
?
oldUser
.
getTelphone
():
""
)+
"
改为
"
+
user
.
getTelphone
()));
}
}
user
.
setNoPassword
(
oldUser
.
getNoPassword
());
user
.
setNoPassword
(
oldUser
.
getNoPassword
());
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论