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
dd72510f
Commit
dd72510f
authored
Oct 29, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
444643d2
a710ab4d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+2
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+10
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
dd72510f
...
@@ -899,6 +899,8 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
...
@@ -899,6 +899,8 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
ignoreFields
.
add
(
"deptId"
);
ignoreFields
.
add
(
"deptId"
);
ignoreFields
.
add
(
"deptNo"
);
ignoreFields
.
add
(
"deptNo"
);
ignoreFields
.
add
(
"standardInfos"
);
ignoreFields
.
add
(
"standardInfos"
);
ignoreFields
.
add
(
"upperLimit"
);
ignoreFields
.
add
(
"lowerLimit"
);
// 更新档案管理规则
// 更新档案管理规则
if
(
Common
.
isNotNull
(
autoEmpRuleNew
)){
if
(
Common
.
isNotNull
(
autoEmpRuleNew
)){
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
dd72510f
...
@@ -1355,11 +1355,20 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1355,11 +1355,20 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
else
{
}
else
{
dispatch
.
setContactAddress
(
excel
.
getContactAddress
());
dispatch
.
setContactAddress
(
excel
.
getContactAddress
());
}
}
dispatch
.
setOrganName
(
null
==
user
?
"自动化派单部门"
:
user
.
getDeptName
());
String
deptName
=
null
;
if
(
Common
.
isNotNull
(
excel
.
getPreLoginName
()))
{
R
<
SysUser
>
res
=
upmsDaprUtils
.
getSimpleUserByLoginName
(
excel
.
getPreLoginName
());
if
(
Common
.
isNotNull
(
res
)
&&
Common
.
isNotNull
(
res
.
getData
()))
{
SysUser
loginUser
=
res
.
getData
();
deptName
=
loginUser
.
getDeptName
();
}
}
dispatch
.
setOrganName
(
null
==
deptName
?
user
.
getDeptName
()
:
deptName
);
if
(
Common
.
isNotNull
(
excel
.
getPreId
()))
{
if
(
Common
.
isNotNull
(
excel
.
getPreId
()))
{
dispatch
.
setPreId
(
excel
.
getPreId
());
dispatch
.
setPreId
(
excel
.
getPreId
());
}
}
dispatch
.
setCreateBy
(
null
==
user
?
"1"
:
user
.
getId
());
dispatch
.
setCreateBy
(
null
==
user
?
"1"
:
user
.
getId
());
//如果登录名不为空查询登录人所属部门
dispatch
.
setCreateName
(
Common
.
isNotNull
(
excel
.
getPreName
())
?
excel
.
getPreName
()
:
user
.
getNickname
());
dispatch
.
setCreateName
(
Common
.
isNotNull
(
excel
.
getPreName
())
?
excel
.
getPreName
()
:
user
.
getNickname
());
dispatch
.
setCreateTime
(
LocalDateTime
.
now
());
dispatch
.
setCreateTime
(
LocalDateTime
.
now
());
dispatch
.
setContractSubName
(
excel
.
getContractSubName
());
dispatch
.
setContractSubName
(
excel
.
getContractSubName
());
...
...
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