From 176a924f0881e0b2a4cadb9c0274842bc708a39f Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 20 四月 2025 21:31:54 +0800
Subject: [PATCH] 修改了接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
index 5e766e5..2baa60f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
@@ -1,11 +1,15 @@
package com.ruoyi.web.controller.zhang;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ZCertificate;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfFamily;
import com.ruoyi.domain.dto.UserInfoDto;
@@ -51,9 +55,9 @@
public AjaxResult getByFId(@PathVariable("fid") Long fid){
return AjaxResult.success(zfFamilyService.getByFid(fid));
}
- @GetMapping("/findByFname/{name}")
- public AjaxResult getByFName(@PathVariable("name") String name){
- return AjaxResult.success(zfFamilyService.getByName(name));
+ @GetMapping("/findByFname/{name}/{clanId}")
+ public AjaxResult getByFName(@PathVariable("name") String name, @PathVariable("clanId") Integer clanId){
+ return AjaxResult.success(zfFamilyService.getByName(name, clanId));
}
@@ -83,10 +87,17 @@
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response) {
- List<ZfFamily> list = zfFamilyService.list();
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ Integer clanId = user.getClanId();
+ LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZfFamily::getClanId,clanId);
+ List<ZfFamily> list = zfFamilyService.list(lqw);
+ //.list();
+
System.out.println("------------------");
ExcelUtil<ZfFamily> util = new ExcelUtil<>(ZfFamily.class);
- util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+ util.exportExcel(response, list, "瀹跺涵鍙锋暟鎹�");
}
--
Gitblit v1.9.1