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

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/ZwywLrJbxxServiceImpl.java

@@ -1371,8 +1371,6 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
                 query.setLrCsrq(lr.getLrCsrq());
                 query.setAge(String.valueOf(DateUtils.getCurrentAge(DateUtils.dateTime(YYYYMMDD, lr.getLrCsrq()))));
                 query.setCreateUnit(jgId);
-                query.setStbm(yc.get("stbm"));
-                query.setScwz(yc.get("scwz"));
                 String isyc = yc.get("isyh");
                 String yhcs = yc.get("yhcs");
                 String free = yc.get("is_srje");
@@ -1385,6 +1383,9 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
                 } else {
                     query.setIsdb("0");
                 }
+                if (StringUtils.equals(yc.get("ssxzqh").substring(0, 6), "220302") || StringUtils.equals(yc.get("ssxzqh").substring(0, 6), "220303")) {
+                    query.setIsdb(yc.get("scwz"));
+                }
                 String obtbz = zwywLrJbxxMapper.selectObtbz(query);
                 String btlx = "";
                 String btje = "";