From 699001a9fd31b4fc78e76bcff86ed324dd052c0c Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 12 十一月 2025 17:00:47 +0800
Subject: [PATCH] 修改了一个bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 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 6cae23e..9ceb213 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,19 +1,32 @@
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.ZInfoUser;
+import com.ruoyi.domain.ZCertificate;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfFamily;
import com.ruoyi.domain.dto.UserInfoDto;
+import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfFamilyService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.List;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
* @Author Jinquan_Ou
@@ -28,9 +41,14 @@
@Resource
ZfFamilyService zfFamilyService;
+ @Autowired
+ ZInfoUserService zInfoUserService;
+
@GetMapping("/all")
- public AjaxResult getAllFamily(){
- return AjaxResult.success(zfFamilyService.list());
+ public AjaxResult getAllFamily(ZfFamily zfFamily){
+ Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zfFamilyService.selectDataList(zfFamily, pageNo,pageSize);
}
/**
@@ -44,9 +62,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));
}
@@ -76,10 +94,19 @@
@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