feat: 请假
This commit is contained in:
parent
c7162afbbb
commit
34b457f2e7
|
@ -60,7 +60,7 @@ public class ApprovalProcessController extends BaseController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (approvalProcess.getSubmitterId() != null){
|
if (approvalProcess.getSubmitterId() != null) {
|
||||||
queryWrapper.eq("submitter_id", getLoginUser().getUserId());
|
queryWrapper.eq("submitter_id", getLoginUser().getUserId());
|
||||||
}
|
}
|
||||||
List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
|
List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
|
||||||
|
@ -216,9 +216,9 @@ public class ApprovalProcessController extends BaseController {
|
||||||
.one();
|
.one();
|
||||||
one.setDestinationIdCn(byId.getBusinessTripDestination());
|
one.setDestinationIdCn(byId.getBusinessTripDestination());
|
||||||
String togUserIds = one.getTogUserIds();
|
String togUserIds = one.getTogUserIds();
|
||||||
if (togUserIds != null && !"".equals(togUserIds)){
|
if (togUserIds != null && !"".equals(togUserIds)) {
|
||||||
List<SysUser> userList = new ArrayList<>();
|
List<SysUser> userList = new ArrayList<>();
|
||||||
if (togUserIds.contains(",")){
|
if (togUserIds.contains(",")) {
|
||||||
String[] split = togUserIds.split(",");
|
String[] split = togUserIds.split(",");
|
||||||
for (String s : split) {
|
for (String s : split) {
|
||||||
s = s.trim(); // 移除首尾空格
|
s = s.trim(); // 移除首尾空格
|
||||||
|
@ -228,7 +228,7 @@ public class ApprovalProcessController extends BaseController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
one.setTogUserList(userList);
|
one.setTogUserList(userList);
|
||||||
}else {
|
} else {
|
||||||
SysUser user = sysUserService.selectUserById(Long.parseLong(togUserIds));
|
SysUser user = sysUserService.selectUserById(Long.parseLong(togUserIds));
|
||||||
userList.add(user);
|
userList.add(user);
|
||||||
one.setTogUserList(userList);
|
one.setTogUserList(userList);
|
||||||
|
|
Loading…
Reference in New Issue