fangq 4 лет назад
Родитель
Сommit
522cca00f6

+ 3 - 3
src/main/java/org/springblade/bank/postchange/mapper/PostChangeMapper.xml

@@ -45,9 +45,9 @@
             <if test="postChange.bankNo!=null">
                 AND bank_no = '${postChange.bankNo}'
             </if>
-            <!--<if test="postChange.orgNo!=null">
-                AND org_no = '${postChange.orgNo}'
-            </if>-->
+            <if test="postChange.personNo!=null">
+                AND person_no = '${postChange.personNo}'
+            </if>
             <if test="postChange.orgNos!=null">
                 AND org_no in
                 <foreach item="orgNo" collection="postChange.orgNos" separator="," open="(" close=")" index="">

+ 8 - 1
src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java

@@ -164,12 +164,19 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 		String now = DateUtil.formatDate(DateUtil.now());
 		User user1 = userService.getUserByEhr(sealHandover.getHandoverPersonNo());
 		User user2 = userService.getUserByEhr(sealHandover.getReceiverNo());
+		List<Long> userList = new ArrayList<>();
+		if (user1 != null){
+			userList.add(user1.getId());
+		}
+		if (user2 != null){
+			userList.add(user2.getId());
+		}
 
 		String title = "有關 (" + seal_type + sealHandover.getSealNo() + ") 的交接登記已於" + now + "完成;交出人:" + sealHandover.getHandoverPersonName() + ";接收人:" + sealHandover.getReceiverName();
 		Notice notice = new Notice();
 		notice.setTitle(title);
 		notice.setBusinessType("sealhandover");
-		notice.setTargetIds(user1.getId() + "," + user2.getId());
+		notice.setTargetIds(StringUtil.join(userList));
 		return sendNotice(notice);
 	}