Revert "个人信息 修改时 新增一个最新更新时间"

zqy

2 天以前 c094705a6271051dcd40747da95537a295534be3

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

@@ -129,7 +129,6 @@
        ZInfoUser zInfoUser = zInfoUserService.getInfoById(userId);
        if(zInfoUser!=null)
        {
            zInfoUser.setUpdateTime(zInfoUser.getUpdateTime()==null?zInfoUser.getCreateTime():zInfoUser.getUpdateTime());
            return AjaxResult.success(zInfoUser);
        }
        else
@@ -143,10 +142,7 @@

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

        return AjaxResult.success(infoById);
        return AjaxResult.success(zInfoUserService.getInfoById(userId));
    }
//

@@ -180,7 +176,6 @@
//        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);
@@ -198,14 +193,11 @@
        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());