修改了bug

feige

2024-10-07 e4494a9d934d488f93310e7b2902370140b13bdd

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java

@@ -2,7 +2,9 @@

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfFamily;
@@ -14,6 +16,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
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
@@ -29,8 +34,10 @@
    ZfFamilyService zfFamilyService;

    @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 +51,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));
    }