Commit dd72510f authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16

parents 444643d2 a710ab4d
...@@ -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)){
......
...@@ -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());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment