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
9f0b9672
Commit
9f0b9672
authored
May 06, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.10' into MVP1.7.10
parents
642bf9bb
2dd607b6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
TSocialInfoServiceImpl.java
...s/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java
+2
-1
SysUserServiceImpl.java
...d/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java
+1
-1
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java
View file @
9f0b9672
...
...
@@ -691,7 +691,8 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
socialInfo
.
setDispatchId
(
disExist
.
getId
());
}
// 加流程进展明细
tAuditInfoService
.
doSaveAuditInfo
(
socialInfo
,
handleRemark
,
handleRemark
,
handleRemark
,
user
,
CommonConstants
.
TWO_STRING
);
tAuditInfoService
.
doSaveAuditInfo
(
socialInfo
,
handleRemark
,
handleRemark
,
handleRemark
,
user
,
CommonConstants
.
ONE_STRING
);
return
R
.
ok
(
"成功"
);
}
else
{
return
R
.
failed
(
"状态未变更,请刷新后查看列表状态!"
);
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java
View file @
9f0b9672
...
...
@@ -528,8 +528,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
List
<
String
>
list2
=
list
.
stream
().
map
(
PersonVo:
:
getUid
).
collect
(
Collectors
.
toList
());
List
<
String
>
collect
=
list1
.
stream
().
filter
(
s
->
!
list2
.
contains
(
s
)
).
collect
(
Collectors
.
toList
());
log
.
error
(
"要重置为不可用的用户列表:"
+
collect
);
if
(!
collect
.
isEmpty
())
{
log
.
error
(
"要重置为不可用的用户列表:"
+
collect
);
LambdaUpdateWrapper
<
SysUser
>
settleUpdate
=
new
LambdaUpdateWrapper
<>();
settleUpdate
.
in
(
SysUser:
:
getUsername
,
collect
)
.
set
(
SysUser:
:
getDelFlag
,
CommonConstants
.
ONE_STRING
);
...
...
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