Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/device/device-server/src/main/java/com/usoftchina/smartschool/device/service/impl/IcCardServiceImpl.java

@@ -117,7 +117,7 @@ public class IcCardServiceImpl implements IcCardService {
                 }
             }*/
         }else {
-            logger.error("对应学校名{}或学校{}未找到",sysSchoolDTO.getSchool_name(),sysSchoolDTO.getSchool_id());
+            logger.error("对应学校{}未找到",school);
         }
         return null;
     }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/service/impl/NoticeServiceImpl.java

@@ -142,7 +142,7 @@ public class NoticeServiceImpl implements NoticeService{
         noticers.forEach(noticer -> {
             MessageInfoDTO msg = new MessageInfoDTO();
             String endUrl = null;
-            if (!StringUtils.isEmpty(noticer.getType()) || !StringUtils.isEmpty(noticer.getPersonId())) {
+            if (!StringUtils.isEmpty(noticer.getType()) && !StringUtils.isEmpty(noticer.getPersonId())) {
                 if ("1".equals(noticer.getType().split(",")[0])) {
                     endUrl = "/parent/" + id + "?stuId=" + noticer.getPersonId().split(",")[0];
                 } else {