Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitInfoController.java

@@ -323,6 +323,23 @@ public class UnitInfoController extends BaseController {
 		return ResponseHelper.buildResponse(unitInfoVoIPage);
 	}
 
+	/**
+	 * 根据企业名称查询详情
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/queryByOrgName")
+	@ApiOperation(httpMethod = "GET", value = "根据企业名称查询详情", notes = "根据企业名称查询详情")
+	public ResponseModel<UnitInfoDto> queryForPage(@RequestParam(value = "orgName") String orgName) {
+		UnitInfoDto unitInfoDto = new UnitInfoDto();
+		QueryWrapper<UnitInfo> unitInfoQueryWrapper = new QueryWrapper<UnitInfo>();
+		unitInfoDto.setOrgName(orgName);
+		setQueryWrapper(unitInfoQueryWrapper, unitInfoDto, null);
+		List<UnitInfo> list = unitInfoServiceImpl.list(unitInfoQueryWrapper);
+		unitInfoDto = BeanDtoVoUtils.convert(list.get(0), UnitInfoDto.class);
+		return ResponseHelper.buildResponse(ValidationUtil.isEmpty(orgName) ? null : unitInfoDto);
+	}
 
 	private QueryWrapper<UnitInfo> setQueryWrapper(QueryWrapper<UnitInfo> queryWrapper, UnitInfoDto unitInfoDto,String sort) {
 		queryWrapper.eq("is_delete", false);