anderx лет назад: 3
Родитель
Сommit
4d0364b711

+ 1 - 1
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -1071,7 +1071,7 @@
 
 
   <select id="listAdminBydepIdAndRoleType" resultType="com.goafanti.common.model.Admin">
-    select a.id,a.name  from admin a left join user_role b on a.id =b.uid
+    select a.id,a.name,a.email  from admin a left join user_role b on a.id =b.uid
                                      left join `role` c on b.rid=c.id
     where department_id= #{depId}
       and c.role_type= #{roleType}

+ 4 - 2
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -245,8 +245,10 @@ public class AsyncUtils {
 	private void pushParam(Admin admin, Integer noticeType, String str, List<Notice> notes, StringBuffer emails) {
 		notes.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, admin.getId(),
 				noticeType, str));
-		if (admin.getEmail()!=null&&!emails.toString().contains(admin.getEmail())) {
-			emails = emails.append(admin.getEmail()).append(",");
+		if (admin!=null &&StringUtils.isNotBlank(admin.getEmail())) {
+			if (!emails.toString().contains(admin.getEmail())){
+				emails = emails.append(admin.getEmail()).append(",");
+			}
 		}
 	}