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
64344ae5
Commit
64344ae5
authored
Jun 15, 2020
by
邓实川
Committed by
chenzg
Jul 05, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
细节优化
parent
10ba4ac4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
4 deletions
+1
-4
src/main/java/cn/timer/api/controller/crm/CrmController.java
+0
-3
src/main/java/cn/timer/api/controller/yggl/YgglController.java
+1
-1
No files found.
src/main/java/cn/timer/api/controller/crm/CrmController.java
View file @
64344ae5
...
...
@@ -965,9 +965,6 @@ public class CrmController {
List
<
Integer
>
members
=
getAllBusinessGroupMember
(
orgCode
,
groupId
);
for
(
Integer
memberId
:
members
)
{
Map
<
String
,
Object
>
map
=
selectMap
(
orgCode
,
memberId
,
status
,
startCreateTime
,
endCreateTime
);
if
(
memberId
.
equals
(
12414
))
{
System
.
err
.
println
(
"map++"
+
map
);
}
if
((
Integer
)
map
.
get
(
"num"
)
>
0
)
{
list
.
add
(
map
);
}
...
...
src/main/java/cn/timer/api/controller/yggl/YgglController.java
View file @
64344ae5
...
...
@@ -305,7 +305,7 @@ public class YgglController {
if
(
ObjectUtil
.
isAllNotEmpty
(
ygglMainEmp
.
getRzTime
(),
ygglMainEmp
.
getZzTime
())
&&
!
DateFormatUtils
.
getCompareDate
(
ygglMainEmp
.
getRzTime
(),
ygglMainEmp
.
getZzTime
()))
{
ResultUtil
.
error
(
"入职日期 不可以大于 转正日期"
);
return
ResultUtil
.
error
(
"入职日期 不可以大于 转正日期"
);
}
if
(
ygglMainEmp
.
getEmpNum
()
!=
null
)
{
...
...
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