不切主库查微信id

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

@@ -288,17 +288,11 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		if(!CollectionUtils.isEmpty(notices)) {
 
 			List<WechartDTO> wecharts = new ArrayList<>();
-			//去主库查微信id
-			DynamicDataSourceContextHolder.push("master");// 这是数据源的key
-			List<String> userCodes = users.stream()
-					.map(QcUserMaterialDTO::getUserCode)
-					.collect(Collectors.toList());
-			List<String> wxids = qcCheckTaskIncomeMapper.getWxId(userCodes);
-			for (String wxid : wxids) {
+			for (SysNoticeGroup noticedto : notices) {
 				WechartDTO wechart0 = new WechartDTO();
-				wechart0.setUserId(wxid);
+				wechart0.setUserId(noticedto.getWxId());
 				String contentInfo = notices.get(0).getNoticeContent();
-				contentInfo = contentInfo.replace("${checkNo}", qcCheckTaskIncome.getCheckNo()+"\n");
+				contentInfo = contentInfo.replace("${checkNo}", qcCheckTaskIncome.getCheckNo() + "\n");
 				Matcher m = p2.matcher(contentInfo);
 				contentInfo = m.replaceAll("");
 				wechart0.setText(contentInfo);

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

@@ -296,15 +296,9 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
 		if(!CollectionUtils.isEmpty(notices)) {
 
 			List<WechartDTO> wecharts = new ArrayList<>();
-			//去主库查微信id
-			DynamicDataSourceContextHolder.push("master");// 这是数据源的key
-			List<String> userCodes = users.stream()
-					.map(QcUserMaterialDTO::getUserCode)
-					.collect(Collectors.toList());
-			List<String> wxids = qcCheckTaskIncomeMapper.getWxId(userCodes);
-			for (String wxid : wxids) {
+			for (SysNoticeGroup noticedto : notices) {
 				WechartDTO wechart0 = new WechartDTO();
-				wechart0.setUserId(wxid);
+				wechart0.setUserId(noticedto.getWxId());
 				String contentInfo = notices.get(0).getNoticeContent();
 				contentInfo = contentInfo.replace("${checkNo}", qcCheckTaskProduce.getCheckNo() + "\n");
 				Matcher m = p2.matcher(contentInfo);