Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
ac2939d9
Commit
ac2939d9
authored
Aug 24, 2023
by
周亚武
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
钉钉相关接口
parent
410b849e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
1 deletion
+29
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceLeaveRecordController.java
...odule/attendance/web/AttendanceLeaveRecordController.java
+4
-1
common-lib/src/main/java/com/mortals/xhx/common/pdu/user/UserPdu.java
...rc/main/java/com/mortals/xhx/common/pdu/user/UserPdu.java
+25
-0
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceLeaveRecordController.java
View file @
ac2939d9
...
...
@@ -61,7 +61,10 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont
this
.
addDict
(
model
,
"processStatus"
,
ProcessStatusEnum
.
getEnumMap
());
// this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
List
<
UserPdu
>
userPduList
=
iUserFeign
.
list
(
new
UserPdu
()).
getData
().
getData
();
//从门户获取登录用户信息
UserPdu
userPdu
=
new
UserPdu
();
userPdu
.
setSize
(-
1
);
List
<
UserPdu
>
userPduList
=
iUserFeign
.
list
(
userPdu
).
getData
().
getData
();
Map
<
Long
,
String
>
ans
=
new
HashMap
<>();
for
(
UserPdu
str:
userPduList
)
{
if
(
str
!=
null
)
{
//增加非空判断
...
...
common-lib/src/main/java/com/mortals/xhx/common/pdu/user/UserPdu.java
View file @
ac2939d9
...
...
@@ -181,6 +181,10 @@ public class UserPdu extends BaseEntityLong {
/** AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private
List
<
UserPdu
>
andConditionList
;
private
Integer
page
;
private
Integer
size
;
public
UserPdu
(){}
/**
* 获取 登录名
...
...
@@ -893,6 +897,27 @@ public class UserPdu extends BaseEntityLong {
public
void
setLastLoginAddressList
(
List
<
String
>
lastLoginAddressList
){
this
.
lastLoginAddressList
=
lastLoginAddressList
;
}
@Override
public
Integer
getPage
()
{
return
page
;
}
@Override
public
void
setPage
(
Integer
page
)
{
this
.
page
=
page
;
}
@Override
public
Integer
getSize
()
{
return
size
;
}
@Override
public
void
setSize
(
Integer
size
)
{
this
.
size
=
size
;
}
/**
* 设置 用户ID,主键,自增长
* @param id
...
...
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