zqy
2 天以前 8430d77a62ed5b1cbc1f635ed44ba2a9b5ca5a64
同一用户(电话+姓名相同) 新增用户时 同步uaid和个人简历的信息
3个文件已修改
49 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -456,8 +456,10 @@
            String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
            infoUser.setUaid(uniqueId);
            Boolean same = false;
            if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
                zInfoUserService.setUaidSame(user.getPhonenumber(),user.getUserName(),uniqueId);
                same = zInfoUserService.setUaidSame(user.getPhonenumber(), user.getUserName(), uniqueId);
            }
            // 性别格式转换(String → Integer)
            infoUser.setSex(userAll.getSex().equals("0") ? 0 : 1);
@@ -533,6 +535,10 @@
                infoUser.setRoleId(3L); // 设置家庭角色ID
                zInfoUserService.save(infoUser); // 保存家庭扩展信息
                if(same){
                    zInfoUserService.setUserInfoSame(infoUser);
                }
                // 5.5.1 更新配偶关联信息
                if (userAll.getSpouseId() != null) {
                    ZInfoUser zu = new ZInfoUser();
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -22,7 +22,9 @@
public interface ZInfoUserService extends IService<ZInfoUser> {
    void setUaidSame(String phone, String username,String uniqueId);
    Boolean setUaidSame(String phone, String username,String uniqueId);
    void setUserInfoSame(ZInfoUser zInfoUser);
    void setSpouseOnly(Long spouse);
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -23,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.crypto.spec.PSource;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -57,14 +58,48 @@
    /** 使相同用户名+电话号码相同的用户对应的uaid同步*/
    @Override
    public void setUaidSame(String phone, String username,String uniqueId){
    public Boolean setUaidSame(String phone, String username,String uniqueId){
        UpdateWrapper<ZInfoUser> wrapper = new UpdateWrapper<>();
        wrapper.eq(phone!=null,"phone_number", phone)
                .eq(username!=null,"old_name",username)
                .set("uaid",uniqueId );
        this.update(null, wrapper); // 执行更新
        return true;
    }
    /** 使相同用户名+电话号码相同的用户对应的inforuser表同步*/
    @Override
    public void setUserInfoSame(ZInfoUser zInfoUser){
        ZInfoUser zInfoUser1 = new ZInfoUser();
        zInfoUser1.setPhoneNumber(zInfoUser.getPhoneNumber());
        zInfoUser1.setOldName(zInfoUser.getOldName());
        LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser1);
        if (list(lqw).size() != 0){
            ZInfoUser newUser = new ZInfoUser();
            // 拷贝所有属性
            BeanUtils.copyProperties(list(lqw).get(0), newUser);
            newUser.setUserId(zInfoUser.getUserId());
            newUser.setSysId(zInfoUser.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);
            System.out.println("ddddd"+newUser);
            this.updateById(newUser);
        }
    }
    @Override