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
57465525
Commit
57465525
authored
Jan 20, 2025
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 去掉暂时不用的传参+根据账号名查用户加上删除标识的过滤
parent
dc3bce06
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
AbastractAuditProcess.java
...us/v1/yifu/salary/service/impl/AbastractAuditProcess.java
+1
-1
TInsuranceUnpurchaseApplyServiceImpl.java
...ry/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java
+1
-1
UserController.java
...u/cloud/plus/v1/yifu/admin/controller/UserController.java
+2
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/AbastractAuditProcess.java
View file @
57465525
...
@@ -210,7 +210,7 @@ public abstract class AbastractAuditProcess<T,E extends T> {
...
@@ -210,7 +210,7 @@ public abstract class AbastractAuditProcess<T,E extends T> {
* @return R<List<SysUser>>
* @return R<List<SysUser>>
**/
**/
public
R
<
List
<
SysUser
>>
getAuditUserList
(
String
entityId
,
YifuUser
loginUser
,
String
departId
,
String
processType
,
String
auditType
,
public
R
<
List
<
SysUser
>>
getAuditUserList
(
String
entityId
,
YifuUser
loginUser
,
String
departId
,
String
processType
,
String
auditType
,
String
reason
,
String
entityName
,
T
entity
,
Class
<
T
>
clazz
)
{
String
reason
,
String
entityName
,
T
entity
)
{
// 获取审批流程完整配置
// 获取审批流程完整配置
ProcessVo
processVo
=
this
.
getProcessVoByType
(
processType
);
ProcessVo
processVo
=
this
.
getProcessVoByType
(
processType
);
if
(
Common
.
isEmpty
(
processVo
))
{
if
(
Common
.
isEmpty
(
processVo
))
{
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java
View file @
57465525
...
@@ -614,7 +614,7 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
...
@@ -614,7 +614,7 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
// 传:流程类型 1不购买商险申请;审核类型 0不购买商险审核
// 传:流程类型 1不购买商险申请;审核类型 0不购买商险审核
R
<
List
<
SysUser
>>
auditUserListR
=
tInsuranceUnpurchaseApplyAuditProcess
.
getAuditUserList
(
id
,
user
,
entity
.
getCreateUserDeptId
(),
R
<
List
<
SysUser
>>
auditUserListR
=
tInsuranceUnpurchaseApplyAuditProcess
.
getAuditUserList
(
id
,
user
,
entity
.
getCreateUserDeptId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
ZERO_STRING
,
CommonConstants
.
ONE_STRING
,
CommonConstants
.
ZERO_STRING
,
""
,
entity
.
getApplyNo
(),
entity
,
TInsuranceUnpurchaseApply
.
class
);
""
,
entity
.
getApplyNo
(),
entity
);
if
(
auditUserListR
==
null
||
auditUserListR
.
getCode
()
!=
CommonConstants
.
SUCCESS
||
auditUserListR
.
getData
()
==
null
)
{
if
(
auditUserListR
==
null
||
auditUserListR
.
getCode
()
!=
CommonConstants
.
SUCCESS
||
auditUserListR
.
getData
()
==
null
)
{
throw
new
CheckedException
(
"获取审批人失败,请联系管理员"
);
throw
new
CheckedException
(
"获取审批人失败,请联系管理员"
);
}
}
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserController.java
View file @
57465525
...
@@ -454,7 +454,8 @@ public class UserController {
...
@@ -454,7 +454,8 @@ public class UserController {
@Inner
@Inner
@PostMapping
(
value
=
{
"/inner/getSimpleUserByLoginName"
})
@PostMapping
(
value
=
{
"/inner/getSimpleUserByLoginName"
})
public
SysUser
getSimpleUserByLoginName
(
@RequestBody
String
loginName
)
{
public
SysUser
getSimpleUserByLoginName
(
@RequestBody
String
loginName
)
{
return
userService
.
getOne
(
Wrappers
.<
SysUser
>
query
().
lambda
().
eq
(
SysUser:
:
getUsername
,
loginName
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
return
userService
.
getOne
(
Wrappers
.<
SysUser
>
query
().
lambda
().
eq
(
SysUser:
:
getUsername
,
loginName
)
.
eq
(
SysUser:
:
getDelFlag
,
CommonConstants
.
ZERO_STRING
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
}
/**
/**
...
...
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