zqy
4 天以前 043816358a40b094f8aa7493703a961190bbfa64
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -25,6 +25,7 @@
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -159,8 +160,11 @@
        Long userId = user.getUserId();
        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));
@@ -176,10 +180,15 @@
        Long userId = user.getUserId();
        zInfoUser.setSysId(userId);
        Long userId1 = zInfoUserService.getInfoBysysId(userId).getUserId();
        zInfoUser.setUserId(userId1);
//        ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(userId);
//
//
//        zInfoUser.setUserId(infoBysysId.getUserId());
        user.setNickName(zInfoUser.getNickName());
        user.setSex(zInfoUser.getSex()+"");
        user.setUserName(zInfoUser.getOldName());
        user.setPhonenumber(zInfoUser.getPhoneNumber());
@@ -200,13 +209,38 @@
        userService.updateUser(user);
        //LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
        //修改uaid相同的用户记录
        if(oriUaid!=null) {
            List<ZInfoUser> list = zInfoUserService.findByUaidToFaid(oriUaid);
            for(ZInfoUser zInfoUser1: list)
                zInfoUser1.setUaid(oriUaid);
            return toAjax(zInfoUserService.saveBatch(list));
            for (int i = 0; i < list.size(); i++) {
                ZInfoUser oldUser = list.get(i);
                ZInfoUser newUser = new ZInfoUser();
                // 拷贝所有属性
                BeanUtils.copyProperties(zInfoUser, newUser);
                newUser.setUserId(oldUser.getUserId());
                newUser.setSysId(oldUser.getSysId());
                newUser.setFamilyId(null);
                newUser.setFatherId(null);
                newUser.setMomId(null);
                newUser.setUrl(null);
                newUser.setSpouseId(null);
                newUser.setIsMyFamily(null);
                newUser.setCreateTime(null);
                newUser.setClanId(null);
                newUser.setNickName(null);
                list.set(i,newUser);
                if(!newUser.getUserId().equals(zInfoUser.getUserId())){
                    user.setNickName(null);
                    user.setUserId(oldUser.getSysId());
                    userService.updateUser(user);
                }
            }
            return toAjax(zInfoUserService.updateBatchById(list));
        }
        else
        // uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
@@ -322,9 +356,7 @@
        List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
        HashMap<Long,String> bs = new HashMap<>();
        for (ZInfoUser zInfoUser:zInfoUsers) {
            if (zInfoUser.getMaritalStatus() ==null || zInfoUser.getMaritalStatus() != 1 )
                bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
        }
        satisfyIds.add(bs);
        return AjaxResult.success(satisfyIds);