修改了bug

feige

2024-11-05 72f21494ba48e573e68007eab2296f8c25ecc4b7

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

@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.zhang;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mysql.cj.x.protobuf.MysqlxDatatypes;
import com.ruoyi.common.annotation.Log;
@@ -12,6 +13,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ShareMore;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfDoctor;
import com.ruoyi.domain.ZfRelation;
@@ -23,6 +25,7 @@
import com.ruoyi.service.ZfFamilyService;
import com.ruoyi.service.ZfRoleService;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -51,6 +54,7 @@

    @Resource
    private ZInfoUserService zInfoUserService;


    @Resource
    private ZfFamilyService zfFamilyService;
@@ -118,12 +122,25 @@
    public AjaxResult getInfo() {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        return AjaxResult.success(zInfoUserService.getInfoById(userId));



        ZInfoUser zInfoUser = zInfoUserService.getInfoById(userId);
        if(zInfoUser!=null)
        {
            return AjaxResult.success(zInfoUser);
        }
        else
            return AjaxResult.success(user);
    }
    @GetMapping("/{id}")
    public AjaxResult getInfoById(@PathVariable("id") Long id) {
      //  SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = id;


        //查询sys_user表
      //  SysUser sysUser = sysUserService.selectUserById(userId);
        return AjaxResult.success(zInfoUserService.getInfoById(userId));
    }
//
@@ -140,8 +157,12 @@
//        }
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        zInfoUser.setUserId(userId);
        return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
        zInfoUser.setSysId(userId);

        LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
        uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
        return toAjax(zInfoUserService.update(uw));
            //    saveOrUpdate(zInfoUser));
    }


@@ -365,6 +386,14 @@
        return zInfoUserService.getInfoByfid(fid);
    }

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

}