20250219_sun

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqSqServiceImpl.java

@@ -653,8 +653,9 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
     public List<GljtUserLr> programLrJtList() {
         List<SysDictData> pcDictDataList = DictUtils.getDictCache("GL013");
         List<GljtUserLr> res = gljtUserLrMapper.selectList(new LambdaQueryWrapper<GljtUserLr>()
-                .like(GljtUserLr::getUserId, String.valueOf(SecurityUtils.getUserId())).eq(GljtUserLr::getStatus, "1")
+                .like(GljtUserLr::getUserId, String.valueOf(SecurityUtils.getUserId()))
                 .orderByDesc(GljtUserLr::getCreateTimeStr));
+        List<GljtUserLr> res2 = new ArrayList<>();
         for (GljtUserLr r: res) {
             EncryptionUtils.decryptForPlaintext(r);
             StringBuilder sbSq = new StringBuilder();
@@ -670,6 +671,9 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
             sbBg.append("按月发放 ");
             sbJkzk.append("按月发放 ");
             GljtSqLr lr = gljtSqLrMapper.selectById(r.getLrId());
+            if (!StringUtils.equals(lr.getStatus(), "1")) {
+                continue;
+            }
             if (ObjectUtils.isNotEmpty(lr)) {
                 GljtXmpz xmpz = gljtXmpzMapper.selectOne(new LambdaQueryWrapper<GljtXmpz>()
                         .likeRight(GljtXmpz::getXzqh, lr.getXzqh().substring(0, 6)));
@@ -691,8 +695,9 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
             r.setLastSqStatus(sbSq.toString());
             r.setLastBgStatus(sbBg.toString());
             r.setJkzkStatus(sbJkzk.toString());
+            res2.add(r);
         }
-        return res;
+        return res2;
     }
 
     @Override