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

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtJkzk.java

@@ -144,6 +144,15 @@ public class GljtJkzk extends BaseEntity
     @TableField(exist = false)
     private String xzqhCode;
 
+    @TableField(exist = false)
+    private String sqrZjzm;
+
+    @TableField(exist = false)
+    private String sqrZjbm;
+
+    @TableField(exist = false)
+    private String tx;
+
     private String fj;
 
     private String state;

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

@@ -73,6 +73,15 @@ public class GljtJkzkServiceImpl implements IGljtJkzkService
     public GljtJkzk selectGljtJkzkById(String id)
     {
         GljtJkzk res = gljtJkzkMapper.selectById(id);
+        if (!ObjectUtils.isEmpty(res)) {
+            GljtSqLr lr = gljtSqLrMapper.selectOne(new LambdaQueryWrapper<GljtSqLr>()
+                    .eq(GljtSqLr::getSqrZjhm, SecurityUtils.sm4encrypt_ECB(EncryptionUtils.key, res.getSfzh())));
+            if (!ObjectUtils.isEmpty(lr)) {
+                res.setSqrZjzm(lr.getSqrZjzm());
+                res.setSqrZjbm(lr.getSqrZjbm());
+                res.setTx(lr.getTx());
+            }
+        }
         EncryptionUtils.decryptForPlaintext(res);
         res.setXzqhName(SysDeptJlUtils.getDeptCache(res.getXzqh()));
         res.setXzqhCode(sysDeptJlMapper.getXzqhCodes(res.getXzqh()));