来料检验+微信2

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -617,7 +617,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 	}
 
 	@Override
-	//@Transactional(rollbackFor = Exception.class)
+	@Transactional(rollbackFor = Exception.class)
 	public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) {
 		List<QcCheckTaskDetail> details = qcCheckTaskIncome.getQcCheckTaskDetails();
 
@@ -821,11 +821,11 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			List<SysNoticeGroup> notices = qcCheckTaskIncomeMapper.getNoticesGroup(noticeQo);
 			if(!CollectionUtils.isEmpty(notices)) {
 				List<WechartDTO> wecharts = new ArrayList<>();
-				//去主库查微信id
-				DynamicDataSourceContextHolder.push("master");// 这是数据源的key
-				List<String> userCodes = notices.stream()
-						.map(SysNoticeGroup::getUserCode)
-						.collect(Collectors.toList());
+//				//去主库查微信id
+//				DynamicDataSourceContextHolder.push("master");// 这是数据源的key
+//				List<String> userCodes = notices.stream()
+//						.map(SysNoticeGroup::getUserCode)
+//						.collect(Collectors.toList());
 				//Map<String, SysUser> wxidsMap = qcCheckTaskIncomeMapper.getWxIdMap(userCodes);
 				for (SysNoticeGroup noticedto : notices) {
 //					SysUser sysUser = wxidsMap.get(noticedto.getUserCode());