Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
e2a0289f
Commit
e2a0289f
authored
Apr 17, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.9-改为deptId
parent
4eb91595
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
TSalaryAccountController.java
...s/v1/yifu/salary/controller/TSalaryAccountController.java
+3
-3
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryAccountController.java
View file @
e2a0289f
...
@@ -267,11 +267,11 @@ public class TSalaryAccountController {
...
@@ -267,11 +267,11 @@ public class TSalaryAccountController {
if
(
Common
.
isNotNull
(
deptNo
))
{
if
(
Common
.
isNotNull
(
deptNo
))
{
queryWrapperSa
.
eq
(
"DEPT_NO"
,
deptNo
);
queryWrapperSa
.
eq
(
"DEPT_NO"
,
deptNo
);
}
}
if
(
Common
.
isNotNull
(
deptName
))
{
if
(
Common
.
isNotNull
(
settleDepartId
))
{
queryWrapperSa
.
like
(
"DEPT_NAME"
,
deptName
);
queryWrapperSa
.
eq
(
"DEPT_ID"
,
settleDepartId
);
}
}
if
(
Common
.
isNotNull
(
settlementMonth
)
&&
settlementMonth
.
length
()
<
6
)
{
if
(
Common
.
isNotNull
(
settlementMonth
)
&&
settlementMonth
.
length
()
<
6
)
{
queryWrapperSa
.
like
(
"SETTLEMENT_MONTH"
,
settlementMonth
);
queryWrapperSa
.
eq
(
"SETTLEMENT_MONTH"
,
settlementMonth
);
}
}
queryWrapperSa
.
orderByAsc
(
"SETTLEMENT_MONTH"
);
queryWrapperSa
.
orderByAsc
(
"SETTLEMENT_MONTH"
);
List
<
TSalaryAccount
>
salaryAccountList
=
tSalaryAccountService
.
list
(
queryWrapperSa
);
List
<
TSalaryAccount
>
salaryAccountList
=
tSalaryAccountService
.
list
(
queryWrapperSa
);
...
...
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