新增查询站下人员接口

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

@@ -137,4 +137,6 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     List<OrgUsrSyncDto> getOrgUsrSyncDataList(Map<String, Object> map);
 
     List<OrgUsr> companyUserTreeByUserAndType(Map<String, Object> param);
+    List<OrgUsr> companyUserTreeByUserAndTypeALL(@Param("bizorgcode") String bizorgcode);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -373,6 +373,7 @@ public interface IOrgUsrService {
      OrgUsr selectParentOrgUsr(OrgUsr orgUsr);
 
     List<OrgMenuDto> companyUserTreeByUserAndType(ReginParams reginParams);
+    List<OrgMenuDto> companyUserTreeByUserAndTypeAll(String bizorgcode);
 
     List<DynamicFormInstance> selectTelById(List<String> ids, String type);
 }

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

@@ -1151,4 +1151,16 @@ LEFT JOIN (
         usr.is_delete = false
           and usr.biz_org_code like CONCAT(#{bizOrgCode},'%')
     </select>
+
+    <select id="companyUserTreeByUserAndTypeALL"
+            resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT
+            usr.*
+        FROM
+            cb_org_usr usr
+        where
+        usr.is_delete = false
+        and usr.biz_org_code like CONCAT(#{bizorgcode},'%')
+	    GROUP BY biz_org_name
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -1039,6 +1039,20 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(menus);
 	}
 
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/companyUserTreeByUserAndTypeAll", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "获取单位部门用户树", notes = "根据登陆人获取单位部门用户树")
+	public ResponseModel<List<OrgMenuDto>> companyUserTreeByUserAndTypeALL() {
+		// 获取登陆人角色
+		ReginParams reginParams = getSelectedOrgInfo();
+		UserDto userDto=iOrgUsrService.selectByIdUser(reginParams.getUserModel().getUserId());
+		String  bizorgcode=userDto.getCompanyBizOrgCode();
+		List<OrgMenuDto> menus = iOrgUsrService.companyUserTreeByUserAndTypeAll(bizorgcode);
+		return ResponseHelper.buildResponse(menus);
+	}
+
+
 	/**
 	 * 获取人员电话
 	 * @param

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

@@ -2794,7 +2794,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				if(bizOrg.getBizOrgType().equals("COMPANY")){
 					userDto.setCompanyBizOrgCode(bizOrg.getBizOrgCode());
 				}else{
-					userDto.setCompanyBizOrgCode(getCompany(userDto));
+					userDto.setCompanyBizOrgCode(getCompany(orgUsr));
 				}
 
 			} else {
@@ -2817,12 +2817,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 
-	public String getCompany(UserDto userDto ){
+	public String getCompany(OrgUsr userDto ){
 		if(userDto.getBizOrgType().equals("COMPANY")){
-
 			return userDto.getBizOrgCode();
 		}else{
-			return getCompany(userDto);
+			OrgUsr bizOrg = orgUsrMapper.queryBySequenceNbr(userDto.getParentId());
+			return getCompany(bizOrg);
 		}
 	}
 
@@ -3472,6 +3472,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
+	public List<OrgMenuDto> companyUserTreeByUserAndTypeAll(String bizorgcode) {
+
+		List<OrgUsr> list = orgUsrMapper.companyUserTreeByUserAndTypeALL(bizorgcode);
+		return buildTreeParallel(list);
+	}
+
+	@Override
 	public List<DynamicFormInstance> selectTelById(List<String> ids, String type) {
 		LambdaQueryWrapper<DynamicFormInstance> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(DynamicFormInstance::getFieldCode, type);