修改代码

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -113,6 +113,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     @DataAuth(interfacePath="")
     List<OrgUsr> companyDeptListWithPersonCount(Map<String, Object> param);
 
+    List<OrgUsr> companyDeptListWithPersonCountNew(Map<String, Object> param);
+
     List<OrgUsr> companyTreeByUser(String bizOrgCode);
 
     Map<String,String> selectPersonone(@Param("name")String name ,@Param("id")Long id);

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -960,6 +960,19 @@ LEFT JOIN (
         and usr.is_delete = false
     </select>
 
+    <select id="companyDeptListWithPersonCountNew"
+            resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT
+            usr.*,
+            (select count(1) from cb_org_usr u where u.biz_org_type = 'PERSON' and u.is_delete = false and u.biz_org_code like CONCAT(usr.biz_org_code,'%')) as total
+        FROM
+            cb_org_usr usr
+        where
+            (usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT')
+          and usr.is_delete = false
+    </select>
+
+
     <select id="companyTreeByUser"
             resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
         SELECT

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -2713,7 +2713,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		Map<String, Object> param = new HashMap<>();
 		// 权限处理
 		param.put("bizOrgCode", reginParams.getPersonIdentity().getBizOrgCode());
-		List<OrgUsr> list = orgUsrMapper.companyDeptListWithPersonCount(param);
+		List<OrgUsr> list = orgUsrMapper.companyDeptListWithPersonCountNew(param);
 		return buildTreeParallel(list);
 	}