Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentGoodsSellDao.java

@@ -57,7 +57,7 @@ public interface StudentGoodsSellDao extends BaseDAO<Integer, StudentGoodsSell>
      * @param autoAffirmReceiveTime:
      * @return java.util.List<java.lang.String>
      */
-    String queryNoAffirmOrderNo(@Param("autoAffirmReceiveTime") String autoAffirmReceiveTime, @Param("tenantid") Integer tenantid);
+    String queryNoAffirmOrderNo(@Param("autoAffirmReceiveTime") String autoAffirmReceiveTime, @Param("tenantId") Integer tenantid);
 
     /**
      * @describe 自动确认收货

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -317,12 +317,15 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			return;
 		}
 		Integer userId = receivers.keySet().iterator().next();
+		Integer receiverTenantId = 0;
 		SimpleUserDto simpleUserDto = teacherDao.getSimpleUser(userId);
-		Integer receiverTenantId = simpleUserDto.getTenantId();
+		if(simpleUserDto != null){
+			receiverTenantId = simpleUserDto.getTenantId();
+		}
 
 		// email data from database load, 使用接收者 tenantId, 假设发送者和接收者为同一机构
 		if (Objects.equals(messageSender.getSendMode(), "EMAIL")) {
-			LOGGER.info("batch 发送邮件 {} ", simpleUserDto.getTenantId());
+			LOGGER.info("batch 发送邮件 {} ", receiverTenantId);
 			loadEmailInfo(senderTenantId);
 			// debugMode = false;
 		}

mec-biz/src/main/resources/config/mybatis/ClassGroupStudentMapperMapper.xml

@@ -640,9 +640,6 @@
                 #{studentId}
             </foreach>
         </if>
-        <if test="tenantId!=null">
-            AND cgsm.tenant_id_=#{tenantId}
-        </if>
     </select>
 
     <select id="getLessThenThreeClassGroupIds" resultType="java.lang.Long">