From 05bf113bfb0d148f12ecdc9d2016316b32ce21f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E5=9B=BD=E4=B8=9C?= <mythxb@qq.com>
Date: Thu, 8 Dec 2022 13:49:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E7=88=B6=E7=BA=A7=20?=
 =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=88=B6=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/rzyc/model/user/ListPerform.java | 22 +++++++++++++++++++
 .../mapper/ent/SysEnterpriseMapper.xml        |  8 +++----
 .../controller/ent/PcCompanyController.java   |  9 +-------
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java b/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java
index 40c291a..2b89095 100644
--- a/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java
+++ b/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java
@@ -55,6 +55,12 @@ public class ListPerform implements Serializable {
     @ApiModelProperty("可查看履职的职务id")
     private String viewJurisdiction;
 
+    @ApiModelProperty("父级地址")
+    private String parentPath;
+
+    @ApiModelProperty("父级名称")
+    private String parentName;
+
     @ApiModelProperty("创建时间")
     private Date createdon;
 
@@ -80,6 +86,22 @@ public class ListPerform implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    public String getParentPath() {
+        return parentPath;
+    }
+
+    public void setParentPath(String parentPath) {
+        this.parentPath = parentPath;
+    }
+
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
     public String getSuperName() {
         return superName;
     }
diff --git a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml
index afe2fc8..4e6320e 100644
--- a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml
@@ -56,6 +56,9 @@
     <result column="communityName" jdbcType="VARCHAR" property="communityName" />
     <result column="qr_code" jdbcType="VARCHAR" property="qrCode"/>
     <result column="street_code" jdbcType="VARCHAR" property="streetCode"/>
+    <result column="area_name" jdbcType="VARCHAR" property="areaName"/>
+    <result column="area_code" jdbcType="VARCHAR" property="areaCode"/>
+    <result column="area_path" jdbcType="VARCHAR" property="areaPath"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -788,11 +791,8 @@
 
 
   <select id="selectPCList" resultMap="BaseResultMap">
-    select sys.*,org.OrgName,st.OrgName streetName,cm.OrgName communityName
+    select sys.*
     from SysEnterprise sys
-        left join SysOrg org on sys.OrgCode = org.OrgCode
-    left join SysOrg st on sys.street_code = st.OrgCode
-    left join SysOrg cm on sys.community_code = cm.OrgCode
     where 1=1
     <if test="2 == isAdmin">
       AND sys.State='启用'
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java
index daf8759..badbd5e 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java
@@ -93,14 +93,7 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
         getDatePage(pager,object);
         if (object != null){
             for(SysEnterprise enterprise : pager.getRows()){
-                String orgName = enterprise.getOrgName();
-                if(StringUtils.isNotBlank(enterprise.getStreetName())){
-                    orgName = orgName + "-" + enterprise.getStreetName();
-                }
-                if(StringUtils.isNotBlank(enterprise.getCommunityName())){
-                    orgName = orgName + "-" + enterprise.getCommunityName();
-                }
-                enterprise.setOrgName(orgName);
+                enterprise.setOrgName(enterprise.getAreaName());
             }
 
             singleResult.setMessage(Message.SUCCESS);