Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-cost-system
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bltdc
dc-cost-system
Commits
b4f96d9a
Commit
b4f96d9a
authored
Nov 17, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
0fbc0caa
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
DepartmentCheckState.java
...ule/cost/service/impl/costcheck/DepartmentCheckState.java
+1
-3
OtherApplicationTests.java
...re/src/test/java/com/blt/other/OtherApplicationTests.java
+3
-1
No files found.
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costcheck/DepartmentCheckState.java
View file @
b4f96d9a
...
...
@@ -45,8 +45,7 @@ public class DepartmentCheckState extends CostState {
}
//如果不需要审核 直接通过
if
(
costContext
.
currentUserId
!=
null
)
{
OaUser
oaUser
=
oaUserMapper
.
selectByOaUserId
(
currentUserId
);
OaUser
oaUser
=
oaUserMapper
.
selectByOaUserId
(
costDomain
.
getCreateUserid
());
OaDepartment
oaDepartment
=
oaDepartmentMapper
.
selectByDepartmentId
(
oaUser
.
getPrimaryDepartmentId
());
if
(
costTemplate
.
shouldDepartmentCheck
(
costDomain
,
oaDepartment
.
getDepartmentMinimumReviewAmount
()))
{
...
...
@@ -61,7 +60,6 @@ public class DepartmentCheckState extends CostState {
return
;
}
}
//需要自动审核
...
...
bailuntec-cost-core/src/test/java/com/blt/other/OtherApplicationTests.java
View file @
b4f96d9a
...
...
@@ -4,6 +4,7 @@ import com.alibaba.excel.EasyExcel;
import
com.bailuntec.api.bailuntec.oa.OaApi
;
import
com.bailuntec.api.bailuntec.oa.response.OaDepartmentResp
;
import
com.bailuntec.api.bailuntec.oa.response.OaUserResp
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.blt.other.module.auth.model.OaDepartment
;
import
com.blt.other.module.auth.model.OaUser
;
import
com.blt.other.module.auth.service.IOaDepartmentService
;
...
...
@@ -75,8 +76,9 @@ public class OtherApplicationTests {
oaUserList
.
forEach
(
oaUser
->
oaUser
.
setPrimaryDepartmentId
(
this
.
getPrimaryDepartment
(
oaDepartmentMap
,
oaDepartmentMap
.
get
(
oaUser
.
getDepartmentId
())).
getDepartmentId
()));
oaUserService
.
remove
(
new
LambdaQueryWrapper
<>());
oaUserService
.
saveBatch
(
oaUserList
);
oaDepartmentService
.
saveBatch
(
oaDepartmentList
);
//
oaDepartmentService.saveBatch(oaDepartmentList);
}
...
...
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