新增字段

zqy

2 天以前 82cd5b62b3d151bc6f0e3c572008c46e0c89e834

 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;
@@ -128,6 +129,7 @@
        ZInfoUser zInfoUser = zInfoUserService.getInfoById(userId);
        if(zInfoUser!=null)
        {
            zInfoUser.setUpdateTime(zInfoUser.getUpdateTime()==null?zInfoUser.getCreateTime():zInfoUser.getUpdateTime());
            return AjaxResult.success(zInfoUser);
        }
        else
@@ -141,7 +143,10 @@

        //查询sys_user表
        //  SysUser sysUser = sysUserService.selectUserById(userId);
        return AjaxResult.success(zInfoUserService.getInfoById(userId));
        ZInfoUser infoById = zInfoUserService.getInfoById(userId);
        if (infoById != null) infoById.setUpdateTime(infoById.getUpdateTime()==null?infoById.getCreateTime():infoById.getUpdateTime());

        return AjaxResult.success(infoById);
    }
//

@@ -175,6 +180,7 @@
//        if (!Pattern.matches("^[\\d]+(?:,[\\d]+)*$",zInfoUser.getFamilyId())) {
//            throw new RuntimeException("请输入只有数字和英文逗号的字符串，且数字和逗号必须交替出现");
//        }
        Date currentDate = new Date();
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        zInfoUser.setSysId(userId);
@@ -187,14 +193,19 @@
//
//
//        zInfoUser.setUserId(infoBysysId.getUserId());
        user.setNickName(zInfoUser.getNickName());
        user.setSex(zInfoUser.getSex()+"");
        user.setUserName(zInfoUser.getOldName());
        user.setPhonenumber(zInfoUser.getPhoneNumber());
        user.setEmail(zInfoUser.getEmail());
        user.setUpdateTime(zInfoUser.getUpdateTime()!=null?zInfoUser.getUpdateTime():currentDate);

        String oriUaid = zInfoUser.getUaid();

        String originalString = zInfoUser.getOldName()+"-"+zInfoUser.getPhoneNumber();
        String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
        zInfoUser.setUaid(uniqueId);


//
//        us.setUserId(user.getSysId());
@@ -207,18 +218,41 @@
        userService.updateUser(user);
        //LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();


        System.out.println("{{{{{{{"+oriUaid);
        System.out.println("{{{{{{{"+zInfoUser);
        //修改uaid相同的用户记录
        if(oriUaid!=null) {
            List<ZInfoUser> list = zInfoUserService.findByUaidToFaid(oriUaid);
            for(ZInfoUser zInfoUser1: list)
                zInfoUser1.setUaid(uniqueId);


            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());
            // uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
            return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
        //    saveOrUpdate(zInfoUser));
    }
@@ -331,7 +365,7 @@
        List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
        HashMap<Long,String> bs = new HashMap<>();
        for (ZInfoUser zInfoUser:zInfoUsers) {
                bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
            bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
        }
        satisfyIds.add(bs);
        return AjaxResult.success(satisfyIds);
@@ -461,4 +495,4 @@
        return zInfoUserService.findUserNameAClan(strings1);
    }

}
}