|
@@ -230,13 +230,11 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void add(String mceReceive){
|
|
public void add(String mceReceive){
|
|
- System.out.println("--------------"+mceReceive);
|
|
|
|
JSONObject mceReceiveVO = JSONObject.parseObject(mceReceive);
|
|
JSONObject mceReceiveVO = JSONObject.parseObject(mceReceive);
|
|
String infoTypeName = sysDictDataService.selectDictLabel("message_type",mceReceiveVO.get("infoType").toString());
|
|
String infoTypeName = sysDictDataService.selectDictLabel("message_type",mceReceiveVO.get("infoType").toString());
|
|
- if (mceReceiveVO.containsKey("infoTypeName")) {
|
|
|
|
|
|
+ if (!mceReceiveVO.containsKey("infoTypeName")) {
|
|
mceReceiveVO.put("infoTypeName",infoTypeName);
|
|
mceReceiveVO.put("infoTypeName",infoTypeName);
|
|
}
|
|
}
|
|
- System.out.println("=========="+infoTypeName);
|
|
|
|
MceContent mceContent = new MceContent();
|
|
MceContent mceContent = new MceContent();
|
|
mceContent.setInfoTitle(mceReceiveVO.get("infoTitle").toString());
|
|
mceContent.setInfoTitle(mceReceiveVO.get("infoTitle").toString());
|
|
mceContent.setInfoContent(mceReceiveVO.get("infoContent").toString());
|
|
mceContent.setInfoContent(mceReceiveVO.get("infoContent").toString());
|
|
@@ -262,7 +260,6 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
|
|
LambdaQueryWrapper<MceMbuser> lambdaQuery3 = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<MceMbuser> lambdaQuery3 = Wrappers.lambdaQuery();
|
|
lambdaQuery3.in(MceMbuser::getUserId,userIds);
|
|
lambdaQuery3.in(MceMbuser::getUserId,userIds);
|
|
List<MceMbuser> list3 = mceMbuserService.list(lambdaQuery3);
|
|
List<MceMbuser> list3 = mceMbuserService.list(lambdaQuery3);
|
|
- System.out.println("+++++++++++"+mceReceiveVO.toString());
|
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
for (int i = 0; i < list.size(); i++) {
|
|
if (CollectionUtils.isNotEmpty(list3)){
|
|
if (CollectionUtils.isNotEmpty(list3)){
|
|
for (int j = 0; j < list3.size(); j++) {
|
|
for (int j = 0; j < list3.size(); j++) {
|