合并分支 'dev_20230216' 到 'master'

企标复审计划查询查看合并请求 laws-foton-slrs/foton-wkflow-rest!33
2023-04-23 18:53:47 +08:00
parent dd5bbdcd36 dd4e309dcd
commit 7db17af7f9
1 changed files with 4 additions and 2 deletions
@@ -201,11 +201,13 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
        if(!rows.isEmpty()){
            for (SarBussionessStandState data: rows){
                QueryWrapper<BusProcessNew> objectQueryWrapper = new QueryWrapper<>();
+                String str = "企标复审";
                objectQueryWrapper.isNotNull("PRC_NAME");
                objectQueryWrapper.isNotNull("TASK_ID");
                objectQueryWrapper.isNotNull("MESG");
                objectQueryWrapper.isNotNull("USER_ID");
                objectQueryWrapper.like("MESG",data.getStandId());
+                objectQueryWrapper.like("PRC_NAME",str);
                List<BusProcessNew> busProcessNews = baseMapper.selectList(objectQueryWrapper);
                if(!busProcessNews.isEmpty()){
                    for (BusProcessNew busProcessNew : busProcessNews){
@@ -223,10 +225,10 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
                                    }
                                }
                            }
-                        }else {
-                            objects.add(data);
                        }
                    }
+                }else {
+                    objects.add(data);
                }
            }
        }