修復

src/main/java/org/springblade/bank/keypwd/controller/KeyPwdController.java

@@ -234,6 +234,9 @@ public class KeyPwdController extends BladeController {
 			userLog.setOperationType("sure");
 			userLogService.save(userLog);
 
+			//發送通知
+			noticeService.sendKeyPwdNotice(keyPwd, false, true);
+
 		}
 		return R.status(true);
 	}

src/main/java/org/springblade/bank/sealhandover/controller/SealHandoverController.java

@@ -307,7 +307,6 @@ public class SealHandoverController extends BladeController {
 				sealHandoverService.saveOrUpdate(keep);
 			}
 
-
 			User user = userService.getById(AuthUtil.getUserId());
 			Dept dept = deptService.getById(user.getDeptId());
 			UserLog userLog = new UserLog();

src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java

@@ -130,8 +130,14 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 		if (isEdit){
 			title += "更正：";
 		}
-		Dept dept = deptService.getById(AuthUtil.getDeptId());
-		String HandoverName = (StringUtil.isBlank(keyPwd.getHandoverPersonName()) && dept.getDeptCategory().equals(1)) ? "分行用戶" : keyPwd.getHandoverPersonName();
+		Dept dept;
+		if (keyPwd.getCreateUser() == null){
+			dept = deptService.getById(AuthUtil.getDeptId());
+		}else {
+			User createUser = userService.getById(keyPwd.getCreateUser());
+			dept = deptService.getById(createUser.getDeptId());
+		}
+		String HandoverName = (dept.getDeptCategory().equals(1)) ? "分行用戶" : keyPwd.getHandoverPersonName();
 		String ReceiverName = (StringUtil.isBlank(keyPwd.getReceiverName()) && dept.getDeptCategory().equals(1)) ? "分行用戶" : keyPwd.getReceiverName();
 
 		if (!isComplete){
@@ -257,9 +263,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 		String ReceiverName = (StringUtil.isBlank(sealHandover.getReceiverName()) && dept.getDeptCategory().equals(1)) ? "分行用戶" : sealHandover.getReceiverName();
 
 		if (!isComplete){
-			if (sealHandover.getIsTurnIn().equals(0)){
+//			if (sealHandover.getIsTurnIn().equals(0)){
 				title += HandoverName + "提交了" + "有關 （" + seal_type + sealHandover.getSealNo() + "） 的交接登記" + "，請登入系統進行確認。";
-			}
+//			}
 		}else{
 			if (sealHandover.getIsTurnIn().equals(0)){
 				title += "有關 （" + seal_type + sealHandover.getSealNo() + "） 的交接登記已於" + now + "完成；交出人：" + HandoverName + "；接收人：" + ReceiverName + "。";
@@ -278,6 +284,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 
 	@Override
 	public boolean sendPostChangeNotice(PostChange postChange, boolean isEdit, boolean isComplete) {
+		NoticeVO notice = new NoticeVO();
+
+
 		Dept dept = deptService.getByOrgNo(postChange.getOrgNo());
 		String title = "ORM-通知【網點出納主管及專管員崗位變更記錄表】";
 		if (isEdit){
@@ -285,19 +294,26 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 		}
 		if (isComplete){
 			title += dept.getDeptName() + "機構已提交網點出納主管及專管員崗位變更記錄表，請登陸系統查詢";
+			List<Role> roles = roleService.getRolesByAlias("cashierTeam");
+			List<String> roleIds = roles.stream().map(role -> role.getId() + "").collect(Collectors.toList());
+			List<User> users = userService.getUsersByDeptIdsRoleIds(null, roleIds);
+			List<String> userIds = users.stream().map(user -> user.getId() + "").collect(Collectors.toList());
+			List<String> userEhrs = users.stream().map(user -> user.getEhr()).collect(Collectors.toList());
+			notice.setTargetIds(StringUtil.join(userIds));
+			notice.setTargetEhrs(StringUtil.join(userEhrs, "|"));
 		}else{
-			User user = userService.getById(postChange.getCreateUser());
-			title += user.getName() + "已提交網點出納主管及專管員崗位變更記錄表，請登陸系統查詢";
+			User createUser = userService.getById(postChange.getCreateUser());
+			title += createUser.getName() + "已提交網點出納主管及專管員崗位變更記錄表，請登陸系統查詢";
+			notice.setTargetIds(postChange.getPersonId()+"");
+			User user = userService.getById(postChange.getPersonId());
+			List<String> userEhrList = new ArrayList<>();
+			userEhrList.add(user.getEhr());
+			notice.setTargetEhrs(StringUtil.join(userEhrList, "|"));
 		}
 
-		NoticeVO notice = new NoticeVO();
 		notice.setTitle(title);
 		notice.setBusinessType("postchange");
-		notice.setTargetIds(postChange.getPersonId()+"");
-		User user = userService.getById(postChange.getPersonId());
-		List<String> userEhrList = new ArrayList<>();
-		userEhrList.add(user.getEhr());
-		notice.setTargetEhrs(StringUtil.join(userEhrList, "|"));
+
 		return sendNotice(notice);
 	}