feige
2025-06-17 ebe782f6aa7e2a72926696348114a3348918d7b7
修改了用户号码和用户姓名产生的uuid
2个文件已修改
19 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -13,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.common.utils.uuid.UUID;
import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.Genealogy;
@@ -182,6 +183,12 @@
        user.setSex(zInfoUser.getSex()+"");
        user.setUserName(zInfoUser.getOldName());
        user.setPhonenumber(zInfoUser.getPhoneNumber());
        String oriUaid = zInfoUser.getUaid();
        String originalString = zInfoUser.getOldName()+"-"+zInfoUser.getPhoneNumber();
        String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
        zInfoUser.setUaid(uniqueId);
//
//        us.setUserId(user.getSysId());
//        us.setUserName(user.getUserName());
@@ -192,6 +199,16 @@
//        us.setRemark(user.getRemark());
        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));
        }
        else
        // uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
        return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
        //    saveOrUpdate(zInfoUser));
ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java
@@ -25,7 +25,7 @@
//        InputStream is = new FileInputStream(new File("D:\\test.xlsx"));
//        ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
//        List<ZfProperty> userList = util.importExcel(is);
        String originalString="张若双"+"-13602730899";
        String originalString="钟山"+"-13808810489";
        String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();