用户修改姓名和电话同步修改uaid

zqy

6 天以前 b02beccf4567068cb47a3f1181a00039456c872d

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

@@ -152,7 +152,7 @@
        list = zfAncestorService.selectByCondition(zfAncestor);
       // log.info("导出记录为:{}", list);
        ExcelUtil<AncestorClan> util = new ExcelUtil<>(AncestorClan.class);
        util.exportExcel(response, list, "家庭大事件记录数据");
        util.exportExcel(response, list, "祖先记录数据");

    }
    /**
@@ -166,7 +166,7 @@
        List<AncestorClan> list = zfAncestorService.selectByIds(ids);
      //  log.info("导出记录为:{}",list);
        ExcelUtil<AncestorClan> util = new ExcelUtil<>(AncestorClan.class);
        util.exportExcel(response, list, "保洁收纳记录数据");
        util.exportExcel(response, list, "祖先记录数据");
    }


@@ -176,12 +176,56 @@
     */
    @Log(title = "祖先", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ZfAncestor zfAncestor) {
    public AjaxResult edit(@RequestBody AncestorHelper ancestorHelper) {

        ZfAncestor spouseSex = zfAncestorService.update(zfAncestor);
        updateAncestor(zfAncestor);
        if (spouseSex.getId() != null)
        updateAncestor(spouseSex);
//        ZfAncestor spouseSex = zfAncestorService.update(zfAncestor);
//        updateAncestor(zfAncestor);
//        if (spouseSex.getId() != null)
//        updateAncestor(spouseSex);

        //修改sys_user表
        SysUser us = new SysUser();
        if (ancestorHelper.getName() != null) {
            us.setNickName(ancestorHelper.getName());
            us.setUserName(ancestorHelper.getName());
            //   us.setStatus(String.valueOf(zfAncestor.getStatus()));
        }
        if(ancestorHelper.getSex() != null)
            us.setSex(String.valueOf(ancestorHelper.getSex()));

//        us.setClanId(ancestorHelper.getClanId());
        us.setUserId(ancestorHelper.getSysId());

        if (!userService.checkNickNameUnique(us)) {
            return error("修改祖先'" + us.getNickName() + "'失败，登录账号已存在");
        }
        userService.updateUser(us);


        //修改z_info_user表
        ZInfoUser infoUser = new ZInfoUser();
        infoUser.setSysId(us.getUserId());
        if (ancestorHelper.getName() != null) {
            infoUser.setNickName(us.getNickName());
            infoUser.setOldName(us.getUserName());
        }
        if(ancestorHelper.getSex() != null)
            infoUser.setSex(Integer.parseInt(us.getSex()));
        ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(us.getUserId());
        infoUser.setUserId(infoBysysId.getUserId());

        zInfoUserService.saveOrUpdate(infoUser);

        //修改zf_ancestor表
        ZfAncestor zfAncestor = new ZfAncestor();
//        zfAncestor.setClanId(ancestorHelper.getClanId());
        if (ancestorHelper.getName() != null)
        zfAncestor.setName(ancestorHelper.getName());
        if(ancestorHelper.getSex() != null)
        zfAncestor.setSex(ancestorHelper.getSex());
        zfAncestor.setSysId(ancestorHelper.getSysId());

        zfAncestorService.update(zfAncestor);

        return  AjaxResult.success();
    }
@@ -235,7 +279,7 @@
                return error("新增祖先1'" + usa.getNickName() + "'失败，登录账号已存在");
            }

            us.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
            usa.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
            userService.insertUser(usa);


@@ -307,10 +351,6 @@
            zfAncestor1.setStatus(0);
            zfAncestor1.setSysId(usa.getUserId());
            zfAncestorService.addData(zfAncestor1);




        }
        else{
            //保存祖先管理员,也先保存到sys_user
@@ -351,7 +391,6 @@
            zfAncestor.setSysId(us.getUserId());

            zfAncestorService.addData(zfAncestor);


        }