From 2723e04976f006ace42c6c53627b87e1cc95ff07 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 31 七月 2024 12:27:48 +0800
Subject: [PATCH] 修改bug&分享

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
index 7fadc32..f25f866 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
@@ -14,13 +14,16 @@
 import com.ruoyi.domain.ZfClan;
 import com.ruoyi.service.ZInfoUserService;
 import com.ruoyi.service.ZfAncestorService;
+import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import static com.ruoyi.common.core.page.TableSupport.*;
@@ -39,6 +42,9 @@
 
     @Resource
     ZInfoUserService zInfoUserService;
+
+    @Resource
+    private SysUserRoleMapper sysUserRoleMapper;
 
     @GetMapping("/all/{clanId}")
     public AjaxResult listAll(@PathVariable Integer clanId){
@@ -67,13 +73,21 @@
         us.setPassword(SecurityUtils.encryptPassword(us.getPassword()));
         userService.insertUser(us);
 
+        SysUserRole sysUserRole = new SysUserRole();
+        sysUserRole.setUserId(us.getUserId());
+        sysUserRole.setRoleId(102L);
+        List<SysUserRole> sysUserRoles = new ArrayList<>();
+        sysUserRoles.add(sysUserRole);
+        sysUserRoleMapper.batchUserRole(sysUserRoles);
+
+
 
         ZInfoUser infoUser = new ZInfoUser();
         infoUser.setClanId(zfAncestor.getClanId());
         infoUser.setSex(zfAncestor.getSex());
         infoUser.setNickName(zfAncestor.getName());
         infoUser.setSysId(us.getUserId());
-        infoUser.setRoleId(Long.valueOf(zfAncestor.getRoleId()));
+        infoUser.setRoleId(zfAncestor.getRoleId().longValue());
         infoUser.setIsMyFamily(zfAncestor.getSex() == 0?1:0);
         infoUser.setSpouseId(zfAncestor.getSpouseId().longValue());
 
@@ -99,6 +113,8 @@
 //        us.setRemark(zfAncestor.getRemark());
         userService.updateUser(us);
 
+        Long userId1 = zfAncestor.getSysId();
+        SysUserRole sysUserRole=sysUserRoleMapper.selectUserById(userId1);
         //      System.out.println(user.getFamilyId());
         //   System.out.println("[[[[]]]]]]");
         ZInfoUser infoUser = new ZInfoUser();
@@ -139,8 +155,7 @@
         Long sysId = zfAncestorService.addData(zfAncestor);
         zfAncestor.setSpouseId(sysId.intValue());
         zfAncestor.setSysId(addAncestor(zfAncestor));
-
-            zfAncestorService.updateById(zfAncestor);
+        zfAncestorService.updateById(zfAncestor);
 
 
         return AjaxResult.success();

--
Gitblit v1.9.1