祖先修改忘非空判断

zqy

2024-11-26 4d58d66ba95cba6108dc59d945f45bc8ed719855

祖先修改忘非空判断

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

@@ -185,10 +185,14 @@

        //修改sys_user表
        SysUser us = new SysUser();
        us.setNickName(ancestorHelper.getName());
        //   us.setStatus(String.valueOf(zfAncestor.getStatus()));
        us.setSex(String.valueOf(ancestorHelper.getSex()));
        us.setUserName(ancestorHelper.getName());
        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());

@@ -201,9 +205,12 @@
        //修改z_info_user表
        ZInfoUser infoUser = new ZInfoUser();
        infoUser.setSysId(us.getUserId());
        infoUser.setNickName(us.getNickName());
        infoUser.setOldName(us.getUserName());
        infoUser.setSex(Integer.parseInt(us.getSex()));
        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());

@@ -212,7 +219,9 @@
        //修改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());