优化组织显示问题

Api/src/main/java/com/java110/api/bmo/org/impl/OrgBMOImpl.java

@@ -107,7 +107,7 @@ public class OrgBMOImpl extends ApiBaseBMO implements IOrgBMO {
         businessOrg.putAll(paramInJson);
         businessOrg.put("orgId", "-1");
         businessOrg.put("allowOperation", "T");
-        businessOrg.put("belongCommunityId", "8888");
+        businessOrg.put("belongCommunityId", "");
         //计算 应收金额
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessOrg", businessOrg);
         return business;

Api/src/main/java/com/java110/api/listener/community/ListMyEnteredCommunitysListener.java

@@ -91,9 +91,9 @@ public class ListMyEnteredCommunitysListener extends AbstractServiceApiListener
 
         //2.0 再根据 部门对应的 小区ID查询小区信息
         OrgDto orgDto = new OrgDto();
-        orgDto.setOrgId(orgStaffRelDtos.get(0).getOrgId());
+        orgDto.setOrgId(orgStaffRelDtos.get(0).getParentOrgId());
         orgDto.setStoreId(reqJson.getString("storeId"));
-        orgDto.setOrgLevel("3");
+        orgDto.setOrgLevel("2");
         List<OrgDto> orgDtos = orgInnerServiceSMOImpl.queryOrgs(orgDto);
 
         Assert.listOnlyOne(orgDtos, "根据组织ID未查询到员工对应部门信息或查询到多条数据");
@@ -111,7 +111,7 @@ public class ListMyEnteredCommunitysListener extends AbstractServiceApiListener
                 communitys = new ArrayList<>();
             }
         } else {
-            String companyOrgId = orgDtos.get(0).getParentOrgId();
+            String companyOrgId = orgDtos.get(0).getOrgId();
             OrgCommunityDto orgCommunityDto = new OrgCommunityDto();
             orgCommunityDto.setOrgId(companyOrgId);
             count = orgCommunityInnerServiceSMOImpl.queryOrgCommunitysCount(orgCommunityDto);

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

@@ -25,6 +25,7 @@ public class OrgStaffRelDto extends PageDto implements Serializable {
     private String departmentName;
     private String companyId;
     private String companyName;
+    private String parentOrgId;
 
 
     private Date createTime;
@@ -128,4 +129,12 @@ public class OrgStaffRelDto extends PageDto implements Serializable {
     public void setStaffIds(String[] staffIds) {
         this.staffIds = staffIds;
     }
+
+    public String getParentOrgId() {
+        return parentOrgId;
+    }
+
+    public void setParentOrgId(String parentOrgId) {
+        this.parentOrgId = parentOrgId;
+    }
 }

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

@@ -76,9 +76,10 @@
     <!-- 查询组织员工关系信息 add by wuxw 2018-07-03 -->
     <select id="getOrgStaffRelInfo" parameterType="Map" resultType="Map">
         select t.rel_id,t.rel_id relId,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,t.staff_id,t.staff_id staffId,t.rel_cd,t.rel_cd relCd
-        from u_org_staff_rel t
-        where 1 =1
+        bId,t.org_id,t.org_id orgId,t.staff_id,t.staff_id staffId,t.rel_cd,t.rel_cd relCd,uo.parent_org_id parentOrgId
+        from u_org_staff_rel t,u_org uo
+        where t.org_id = uo.org_id
+        and uo.status_cd = '0'
         <if test="relId !=null and relId != ''">
             and t.rel_id= #{relId}
         </if>
@@ -138,8 +139,9 @@
     <!-- 查询组织员工关系数量 add by wuxw 2018-07-03 -->
     <select id="queryOrgStaffRelsCount" parameterType="Map" resultType="Map">
         select count(1) count
-        from u_org_staff_rel t
-        where 1 =1
+        from u_org_staff_rel t,u_org uo
+        where t.org_id = uo.org_id
+        and uo.status_cd = '0'
         <if test="relId !=null and relId != ''">
             and t.rel_id= #{relId}
         </if>