修改了bug

feige

2024-10-07 f57c5b200b97a01738ace0cfa06e991ee4c01460

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

@@ -10,7 +10,9 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.AncestorClan;
import com.ruoyi.domain.dto.AncestorHelper;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfAncestorService;
@@ -23,12 +25,14 @@
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.domain.AjaxResult.error;
import static com.ruoyi.common.core.page.TableSupport.*;
import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;

@RestController
@RequestMapping("/ZfAncestor")
@@ -140,6 +144,32 @@

        zInfoUserService.updateById(infoUser);
    }
    @Log(title = "家庭大事件记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ZfAncestor zfAncestor) {
        List<AncestorClan> list = new ArrayList<>();

        list = zfAncestorService.selectByCondition(zfAncestor);
       // log.info("导出记录为:{}", list);
        ExcelUtil<AncestorClan> util = new ExcelUtil<>(AncestorClan.class);
        util.exportExcel(response, list, "家庭大事件记录数据");

    }
    /**
     * 导出导出祖先信息记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "导出祖先信息", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export(HttpServletResponse response, @PathVariable Long[] ids)
    {
        List<AncestorClan> list = zfAncestorService.selectByIds(ids);
      //  log.info("导出记录为:{}",list);
        ExcelUtil<AncestorClan> util = new ExcelUtil<>(AncestorClan.class);
        util.exportExcel(response, list, "保洁收纳记录数据");
    }



    /**
     * 修改祖先信息
@@ -171,7 +201,7 @@

            //新增一个默认的家庭号
            ZfFamily zfFamily = new ZfFamily();
            zfFamily.setName("默认一号家庭");
            zfFamily.setName("默认一号家庭"+ancestorHelper.getClanId());
            zfFamily.setFid(0L);
            zfFamily.setMid(0L);
            zfFamily.setClanId(ancestorHelper.getClanId());
@@ -187,8 +217,8 @@
            us.setPassword("123456");
            us.setUserName(ancestorHelper.getName());
            us.setClanId(ancestorHelper.getClanId());
            if (!userService.checkUserNameUnique(us)) {
                return error("新增祖先'" + us.getUserName() + "'失败，登录账号已存在");
            if (!userService.checkNickNameUnique(us)) {
                return error("新增祖先'" + us.getNickName() + "'失败，登录账号已存在");
            }

            us.setPassword(SecurityUtils.encryptPassword(us.getPassword()));
@@ -201,8 +231,8 @@
            usa.setPassword("123456");
            usa.setClanId(ancestorHelper.getClanId());
            usa.setUserName(ancestorHelper.getFname());
            if (!userService.checkUserNameUnique(usa)) {
                return error("新增祖先1'" + usa.getUserName() + "'失败，登录账号已存在");
            if (!userService.checkNickNameUnique(usa)) {
                return error("新增祖先1'" + usa.getNickName() + "'失败，登录账号已存在");
            }

            us.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
@@ -293,8 +323,8 @@
            us.setClanId(ancestorHelper.getClanId());
            System.out.println(ancestorHelper.getClanId());
            System.out.println("0000_______+++++++++++++999999999999");
            if (!userService.checkUserNameUnique(us)) {
                return error("新增祖先管理员'" + us.getUserName() + "'失败，登录账号已存在");
            if (!userService.checkNickNameUnique(us)) {
                return error("新增祖先管理员'" + us.getNickName() + "'失败，登录账号已存在");
            }

            us.setPassword(SecurityUtils.encryptPassword(us.getPassword()));