修改bug

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

@@ -102,6 +102,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     @DataAuth(interfacePath = "")
     List<OrgUsr> companyTreeByUserAndType(Map<String, Object> param);
 
+    List<OrgUsr> equipCompanyExport(String bizOrgCode);
+
     OrgUsr queryBySequenceNbr(@Param("parentId") String parentId);
 
     @DataAuth(interfacePath="")

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

@@ -774,6 +774,14 @@ LEFT JOIN (
             order by usr.rec_date
         </where>
     </select>
+    <select id="equipCompanyExport" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT
+             *
+        FROM
+             cb_org_usr
+        WHERE is_delete = false AND biz_org_code LIKE CONCAT(#{bizOrgCode} '%')  AND( biz_org_type = 'COMPANY' || biz_org_type = 'DEPARTMENT')
+
+    </select>
     <select id="companyDeptListWithPersonCount"
             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

@@ -1432,11 +1432,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	public List<OrgUsr> equipCompanyExport(ReginParams reginParams, String type) {
-		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+
+		List<OrgUsr> list = orgUsrMapper.equipCompanyExport(reginParams.getPersonIdentity().getBizOrgCode());
+		/*LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(BaseEntity::getIsDelete,0);
 		wrapper.likeRight(OrgUsr::getBizOrgCode,reginParams.getPersonIdentity().getBizOrgCode());
 		wrapper.eq(OrgUsr::getBizOrgType,"DEPARTMENT").or().eq(OrgUsr::getBizOrgType,"COMPANY");
-		wrapper.eq(BaseEntity::getIsDelete,false);
-		List<OrgUsr> list = baseMapper.selectList(wrapper);
+		List<OrgUsr> list = baseMapper.selectList(wrapper);*/
 		return list;
 	}