Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
e435759f
Commit
e435759f
authored
4 years ago
by
邓实川
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
操作日志查询条件更新,注册企业id状态更新
parent
1e95fa81
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
16 deletions
+16
-16
src/main/java/cn/timer/api/controller/LoginController.java
+5
-2
src/main/java/cn/timer/api/controller/qyzx/QyzxController.java
+11
-14
No files found.
src/main/java/cn/timer/api/controller/LoginController.java
View file @
e435759f
...
...
@@ -535,10 +535,13 @@ public class LoginController {
return
ResultUtil
.
error
(
"注册企业失败2"
);
}
login
=
qyzxEmpLogin
;
}
else
{
login
.
setOrgId
(
qyId
);
login
.
updateById
();
}
// 员工信息
boolean
b4
=
YgglMainEmp
.
builder
().
orgCode
(
qyId
).
empNum
(
login
.
getId
()).
rzTime
(
new
Date
())
.
name
(
username
).
phone
(
phone
).
workEmail
(
email
).
jobType
(
YgJobType
.
QUANZHI
.
getType
())
boolean
b4
=
YgglMainEmp
.
builder
().
orgCode
(
qyId
).
empNum
(
login
.
getId
()).
rzTime
(
new
Date
())
.
name
(
username
)
.
phone
(
phone
).
workEmail
(
email
).
jobType
(
YgJobType
.
QUANZHI
.
getType
())
.
jobStatus
(
YgEnumInterface
.
jobStatus
.
ZHENSHI
.
getType
()).
build
().
insert
();
if
(!
b4
)
{
TransactionAspectSupport
.
currentTransactionStatus
().
setRollbackOnly
();
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/qyzx/QyzxController.java
View file @
e435759f
package
cn
.
timer
.
api
.
controller
.
qyzx
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.Comparator
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.stream.Collectors
;
...
...
@@ -40,7 +38,6 @@ import cn.timer.api.bean.qyzx.QyzxLogBuy;
import
cn.timer.api.bean.qyzx.QyzxOperLog
;
import
cn.timer.api.bean.qyzx.QyzxPayServe
;
import
cn.timer.api.bean.qyzx.QyzxSuggestionFeeback
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.bean.zzgl.ZzglAuth
;
import
cn.timer.api.bean.zzgl.ZzglBmgwM
;
import
cn.timer.api.config.annotation.CurrentUser
;
...
...
@@ -479,17 +476,17 @@ public class QyzxController {
// IPage<QyzxOperLog> pages = qyzxOperLogMapper.selectPageByQuery(page, qyzxOperLogQuaryDto);
if
(
qyzxOperLogQuaryDto
.
getEmpNums
()
==
null
)
{
YgglMainEmp
main
=
YgglMainEmp
.
builder
().
build
()
.
selectOne
(
new
LambdaQueryWrapper
<
YgglMainEmp
>().
eq
(
YgglMainEmp:
:
getOrgCode
,
userBean
.
getOrgCode
())
.
eq
(
YgglMainEmp:
:
getIsManager
,
1
)
.
select
(
YgglMainEmp:
:
getEmpNum
,
YgglMainEmp:
:
getIsManager
));
List
<
YgglMainEmp
>
child
=
YgglMainEmp
.
builder
().
build
()
.
selectList
(
new
LambdaQueryWrapper
<
YgglMainEmp
>().
eq
(
YgglMainEmp:
:
getOrgCode
,
userBean
.
getOrgCode
()
)
.
eq
(
YgglMainEmp:
:
getIsManager
,
2
)
.
select
(
YgglMainEmp:
:
getEmpNum
,
YgglMainEmp:
:
getIsManager
));
child
.
add
(
main
);
Collections
.
sort
(
child
,
Comparator
.
comparing
(
YgglMainEmp:
:
getIsManager
));
List
<
Integer
>
empNums
=
child
.
stream
().
map
(
YgglMainEmp
:
:
getEmpNum
).
collect
(
Collectors
.
toList
());
List
<
Integer
>
roles
=
new
ArrayList
<
Integer
>();
roles
.
add
(
SysRoleType
.
U_TYPE_ADMIN
.
getType
());
roles
.
add
(
SysRoleType
.
U_TYPE_C_ADMIN
.
getType
(
));
List
<
QyzxEmpEntAsso
>
list
=
QyzxEmpEntAsso
.
builder
().
build
(
)
.
selectList
(
new
LambdaQueryWrapper
<
QyzxEmpEntAsso
>(
)
.
eq
(
QyzxEmpEntAsso:
:
getOrgCode
,
userBean
.
getOrgCode
())
.
in
(
QyzxEmpEntAsso:
:
getUserType
,
roles
).
select
(
QyzxEmpEntAsso:
:
getEmpNum
)
);
List
<
Integer
>
empNums
=
list
.
stream
().
map
(
QyzxEmpEntAsso
:
:
getEmpNum
).
collect
(
Collectors
.
toList
());
qyzxOperLogQuaryDto
.
setEmpNums
(
empNums
);
}
IPage
<
QyzxOperLog
>
pages
=
qyzxOperLogMapper
.
selectPageByQuery2
(
page
,
qyzxOperLogQuaryDto
);
...
...
This diff is collapsed.
Click to expand it.
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