优化组织显示问题

WebService/src/main/resources/components/orgPackage/org-manage/orgManage.html

@@ -37,7 +37,7 @@
 
                         <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryOrgMethod()">
-                                <i class="glyphicon glyphicon-search"></i> 查询
+                                <i class="glyphicon glyphicon-search"></i>
                             </button>
                         </div>
                     </div>
@@ -63,7 +63,7 @@
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddOrgModal()">
                             <i class="glyphicon glyphicon-plus"></i>
-                            添加组织
+                            添加
                         </button>
                     </div>
                 </div>
@@ -85,8 +85,8 @@
                         <tr v-for="org in orgManageInfo.orgs">
                             <td class="text-center">{{org.orgId}}</td>
                             <td class="text-center">{{org.orgName}}</td>
-                            <td class="text-center">{{org.orgLevel}}</td>
-                            <td class="text-center">{{org.parentOrgId}}</td>
+                            <td class="text-center">{{org.orgLevelName}}</td>
+                            <td class="text-center">{{org.orgLevel == 1 ? '无' : org.parentOrgName}}</td>
                             <td class="text-center">
                                 <div class="btn-group" v-if="org.orgLevel != 1">
                                     <button class="btn-white btn btn-xs" v-on:click="_openEditOrgModel(org)">修改</button>

java110-bean/src/main/java/com/java110/dto/org/OrgDto.java

@@ -22,6 +22,10 @@ public class OrgDto extends PageDto implements Serializable {
     private String storeId;
     private String orgId;
 
+    private String parentOrgName;
+
+    private String orgLevelName;
+
 
     private Date createTime;
 
@@ -92,4 +96,20 @@ public class OrgDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getOrgLevelName() {
+        return orgLevelName;
+    }
+
+    public void setOrgLevelName(String orgLevelName) {
+        this.orgLevelName = orgLevelName;
+    }
+
+    public String getParentOrgName() {
+        return parentOrgName;
+    }
+
+    public void setParentOrgName(String parentOrgName) {
+        this.parentOrgName = parentOrgName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/org/ApiOrgDataVo.java

@@ -6,41 +6,67 @@ import java.util.Date;
 public class ApiOrgDataVo implements Serializable {
 
     private String orgId;
-private String orgName;
-private String orgLevel;
-private String parentOrgId;
-private String description;
-public String getOrgId() {
+    private String orgName;
+    private String orgLevel;
+    private String parentOrgId;
+    private String parentOrgName;
+    private String description;
+
+    private String orgLevelName;
+
+    public String getOrgId() {
         return orgId;
     }
-public void setOrgId(String orgId) {
+
+    public void setOrgId(String orgId) {
         this.orgId = orgId;
     }
-public String getOrgName() {
+
+    public String getOrgName() {
         return orgName;
     }
-public void setOrgName(String orgName) {
+
+    public void setOrgName(String orgName) {
         this.orgName = orgName;
     }
-public String getOrgLevel() {
+
+    public String getOrgLevel() {
         return orgLevel;
     }
-public void setOrgLevel(String orgLevel) {
+
+    public void setOrgLevel(String orgLevel) {
         this.orgLevel = orgLevel;
     }
-public String getParentOrgId() {
+
+    public String getParentOrgId() {
         return parentOrgId;
     }
-public void setParentOrgId(String parentOrgId) {
+
+    public void setParentOrgId(String parentOrgId) {
         this.parentOrgId = parentOrgId;
     }
-public String getDescription() {
+
+    public String getDescription() {
         return description;
     }
-public void setDescription(String description) {
+
+    public void setDescription(String description) {
         this.description = description;
     }
 
+    public String getOrgLevelName() {
+        return orgLevelName;
+    }
+
+    public void setOrgLevelName(String orgLevelName) {
+        this.orgLevelName = orgLevelName;
+    }
 
+    public String getParentOrgName() {
+        return parentOrgName;
+    }
 
+    public void setParentOrgName(String parentOrgName) {
+        this.parentOrgName = parentOrgName;
+    }
 }

java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml

@@ -84,10 +84,15 @@
     <!-- 查询组织信息 add by wuxw 2018-07-03 -->
     <select id="getOrgInfo" parameterType="Map" resultType="Map">
         select t.org_name,t.org_name orgName,t.parent_org_id,t.parent_org_id
-        parentOrgId,t.description,t.org_level,t.org_level orgLevel,t.status_cd,t.status_cd
-        statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.org_id,t.org_id orgId
-        from u_org t
+        parentOrgId,t.description,t.org_level,t.org_level orgLevel,td.name orgLevelName,t.status_cd,t.status_cd
+        statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.org_id,t.org_id orgId,uo.org_name parentOrgName
+        from u_org t,t_dict td,u_org uo
         where 1 =1
+        and t.org_level = td.status_cd
+        and td.table_name='u_org'
+        and td.table_columns = 'org_level'
+        and t.parent_org_id = uo.org_id
+        and uo.status_cd = '0'
         <if test="orgName !=null and orgName != ''">
             and t.org_name= #{orgName}
         </if>
@@ -153,8 +158,13 @@
     <!-- 查询组织数量 add by wuxw 2018-07-03 -->
     <select id="queryOrgsCount" parameterType="Map" resultType="Map">
         select count(1) count
-        from u_org t
+            from u_org t,t_dict td,u_org uo
         where 1 =1
+            and t.org_level = td.status_cd
+            and td.table_name='u_org'
+            and td.table_columns = 'org_level'
+            and t.parent_org_id = uo.org_id
+            and uo.status_cd = '0'
         <if test="orgName !=null and orgName != ''">
             and t.org_name= #{orgName}
         </if>