From 5e6d4ae8e05263cc50800cb66fb2e525413615f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Tue, 24 Sep 2024 18:09:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/comp/controller/CompController.java  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/controller/CompController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/controller/CompController.java
index 4ee8f93b..de0defde 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/controller/CompController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/controller/CompController.java
@@ -479,6 +479,26 @@ public class CompController extends JeecgController<Comp, ICompService> {
     @GetMapping(value = "/complistnoxq")
     public Result<?> complistnoxq(@RequestParam(name = "id", required = true) String id) {
        Comp comp = compService.getById(id);
+        if (comp.getCompAdmin()!= null) {
+            QueryChainWrapper<SysUser> query = sysUserService.query();
+            query.eq("work_no", comp.getCompAdmin());
+            SysUser sysUser = query.one();
+            if (sysUser != null && sysUser.getRealname() != null) {
+                comp.setCompAdmin(sysUser.getRealname());
+            }
+        }
+        if (comp.getCompOrgan() != null) {
+            SysDepart sysDepart = iSysDepartService.getById(comp.getCompOrgan());
+            if (sysDepart != null && sysDepart.getDepartName() != null) {
+                comp.setComporderc(sysDepart.getDepartName());
+            }
+        }
+        if (!comp.getCompTypeId().isEmpty()) {
+            CompType compType = compTypeService.getById(comp.getCompTypeId());
+            if (compType != null && compType.getTypeName() != null) {
+                comp.setCompTypeId(compType.getTypeName());
+            }
+        }
         return Result.OK(comp);
     }