分享

zqy

2024-08-02 ecc40c241fa80f0cd053a6dcfc99ba440b788629

 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());

@@ -90,7 +104,7 @@

    public void updateAncestor(ZfAncestor zfAncestor){
        SysUser us = new SysUser();
         Long userId = zInfoUserService.getInfoBysysId(zfAncestor.getSysId()).getUserId();
        Long userId = zInfoUserService.getInfoBysysId(zfAncestor.getSysId()).getUserId();
        us.setUserId(zfAncestor.getSysId());

        us.setUserName(zfAncestor.getName());
@@ -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();
@@ -120,8 +136,10 @@
    @PutMapping
    public AjaxResult edit(@RequestBody ZfAncestor zfAncestor) {

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

        return  AjaxResult.success();
    }
@@ -138,6 +156,8 @@
        zfAncestor.setSpouseId(sysId.intValue());
        zfAncestor.setSysId(addAncestor(zfAncestor));
        zfAncestorService.updateById(zfAncestor);


        return AjaxResult.success();
    }