修改家谱bug

zengqinyu

2025-04-22 c119927474106ead6513f830b02bceea98dc9cde

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

@@ -27,6 +27,7 @@
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -51,7 +52,8 @@
@RestController
@RequestMapping("/self/user")
public class ZInfoUserController extends BaseController {

    @Autowired
    private ISysUserService userService;
    @Resource
    private ZInfoUserService zInfoUserService;

@@ -175,6 +177,20 @@
        Long userId = user.getUserId();
        zInfoUser.setSysId(userId);



        user.setSex(zInfoUser.getSex()+"");
        user.setUserName(zInfoUser.getOldName());
        user.setPhonenumber(zInfoUser.getPhoneNumber());
//
//        us.setUserId(user.getSysId());
//        us.setUserName(user.getUserName());
//        us.setNickName(user.getNickName());
//        us.setRoleId(user.getRoleId());
//        us.setSex(user.getSex());
//        us.setStatus(user.getStatus());
//        us.setRemark(user.getRemark());
        userService.updateUser(user);
        //LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
       // uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
        return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
@@ -372,6 +388,10 @@
    public AjaxResult listGenealogy(Genealogy genealogy){
        Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Integer clanId = user.getClanId();
        if(clanId != null) genealogy.setClanId(clanId);
        System.out.println("11111111//"+clanId);
        return zInfoUserService.listGenealogy(genealogy,pageNum,pageSize);
    }

@@ -405,9 +425,16 @@
     * 分享给其他家族数据，通过输入名字查找所有的同名用户和家族号
    */
    @PostMapping("/byName")
    public AjaxResult listByNickNameDate(@RequestBody ZInfoUser zInfoUser)
    public AjaxResult listByUserNameDate(@RequestBody SysUser sysUser)
    {
        return zInfoUserService.findInfoUserNameAClan(zInfoUser.getNickName());

        List<SysUser> strings = sysUserMapper.getUserByUserName(sysUser.getUserName());
        List<String> strings1= new ArrayList<>();
        for (SysUser s:strings){
            strings1.add(s.getNickName());
        }

        return zInfoUserService.findUserNameAClan(strings1);
    }

}