feige
2024-08-30 8b19a417e339441cec66e18a2a5d68337184dada
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
@@ -187,8 +187,8 @@
            us.setPassword("123456");
            us.setUserName(ancestorHelper.getName());
            us.setClanId(ancestorHelper.getClanId());
            if (!userService.checkUserNameUnique(us)) {
                return error("新增祖先'" + us.getUserName() + "'失败,登录账号已存在");
            if (!userService.checkNickNameUnique(us)) {
                return error("新增祖先'" + us.getNickName() + "'失败,登录账号已存在");
            }
            us.setPassword(SecurityUtils.encryptPassword(us.getPassword()));
@@ -201,8 +201,8 @@
            usa.setPassword("123456");
            usa.setClanId(ancestorHelper.getClanId());
            usa.setUserName(ancestorHelper.getFname());
            if (!userService.checkUserNameUnique(usa)) {
                return error("新增祖先1'" + usa.getUserName() + "'失败,登录账号已存在");
            if (!userService.checkNickNameUnique(usa)) {
                return error("新增祖先1'" + usa.getNickName() + "'失败,登录账号已存在");
            }
            us.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
@@ -293,8 +293,8 @@
            us.setClanId(ancestorHelper.getClanId());
            System.out.println(ancestorHelper.getClanId());
            System.out.println("0000_______+++++++++++++999999999999");
            if (!userService.checkUserNameUnique(us)) {
                return error("新增祖先管理员'" + us.getUserName() + "'失败,登录账号已存在");
            if (!userService.checkNickNameUnique(us)) {
                return error("新增祖先管理员'" + us.getNickName() + "'失败,登录账号已存在");
            }
            us.setPassword(SecurityUtils.encryptPassword(us.getPassword()));