Browse Source

Merge branch '20250219_sun' of sckj/mz-cloud into master

sckj 3 days ago
parent
commit
4f1fa660b4

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

@@ -671,10 +671,10 @@ 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)) {
+                if (!StringUtils.equals(lr.getStatus(), "1")) {
+                    continue;
+                }
                 GljtXmpz xmpz = gljtXmpzMapper.selectOne(new LambdaQueryWrapper<GljtXmpz>()
                         .likeRight(GljtXmpz::getXzqh, lr.getXzqh().substring(0, 6)));
                 if (CollectionUtils.isNotEmpty(pcDictDataList) && ObjectUtils.isNotEmpty(xmpz)) {