bug修改

xuhy

2025-12-24 989dcc6e5a2db194954d48ef411dab60b1fd35ea

bug修改

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java

@@ -158,6 +158,11 @@
            crmBranches.add(crmBranch);
            return R.ok(crmBranches);
        }
        if(crmBranch.getPersonType() == 3){
            List<TCrmBranch> crmBranches = new ArrayList<>();
            crmBranches.add(crmBranch);
            return R.ok(crmBranches);
        }
        return R.ok();
    }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSalespersonController.java

@@ -21,6 +21,7 @@
import com.ruoyi.system.service.TCrmBranchService;
import com.ruoyi.system.service.TCrmChangePointsService;
import com.ruoyi.system.service.TCrmSalespersonService;
import com.ruoyi.system.vo.TCrmSalespersonAndBranchVO;
import com.ruoyi.system.vo.TCrmSalespersonVO;
import com.ruoyi.system.vo.TErpGoodsVO;
import io.swagger.annotations.Api;
@@ -152,6 +153,52 @@
    }

    /**
     * 获取crm业务员信息和分公司信息
     */
    @ApiOperation(value = "获取crm业务员信息和分公司信息")
    @GetMapping(value = "/getSalespersonAndBranch")
    public R<List<TCrmSalespersonAndBranchVO>> getSalespersonAndBranch() {

        Long userId = tokenService.getLoginUser().getUser().getUserId();
        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();

        if(roleType != 3){
            return R.fail("当前用户非业务员角色!");
        }

        LambdaQueryWrapper<TCrmSalesperson> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(TCrmSalesperson::getUserId,userId);
        wrapper.eq(TCrmSalesperson::getStatus,1)
                .orderByDesc(TCrmSalesperson::getCreateTime)
                .last("LIMIT 1");
        TCrmSalesperson crmSalesperson = crmSalespersonService.getOne(wrapper);

        if(Objects.isNull(crmSalesperson)){
            return R.fail("当前用户未绑定业务员信息!");
        }

        List<TCrmSalespersonAndBranchVO> result = new ArrayList<>();

        TCrmSalespersonAndBranchVO vo = new TCrmSalespersonAndBranchVO();
        vo.setId(crmSalesperson.getId());
        vo.setName(crmSalesperson.getSalespersonName());
        vo.setType(2);
        result.add(vo);
        // 查询分公司
        TCrmBranch crmBranch = crmBranchService.getById(crmSalesperson.getBranchId());
        if(Objects.isNull(crmBranch)){
            return R.fail("当前业务员未绑定分公司信息!");
        }
        vo = new TCrmSalespersonAndBranchVO();
        vo.setId(crmBranch.getId());
        vo.setName(crmBranch.getBranchName());
        vo.setType(1);
        result.add(vo);

        return R.ok(result);
    }

    /**
     * 添加crm业务员管理管理
     */
    @Log(title = "crm业务员管理信息-新增crm业务员管理", businessType = BusinessType.INSERT)

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysLiveController.java

@@ -103,20 +103,20 @@
        dto.setEndTime(dto.getStartTime().plusMinutes(dto.getExpectedDuration()));

        // 创建小鹅通直播
        XiaoeLiveDTO xiaoeLiveDTO = new XiaoeLiveDTO();
        xiaoeLiveDTO.setTitle(dto.getLiveTitle());
        xiaoeLiveDTO.setSummary(dto.getLiveIntroduction());
        xiaoeLiveDTO.setZbStartAt(DateUtils.localDateTimeToString(dto.getStartTime()));
        xiaoeLiveDTO.setZbStopAt(dto.getExpectedDuration());
        // 直播类型 0-语音，1-录播直播，2-推流直播，默认为0-语音直播
        xiaoeLiveDTO.setAliveType(2);
        xiaoeLiveDTO.setAliveMode(dto.getLiveMode()==1?0:1);
        xiaoeLiveDTO.setUserId(dto.getLiveLecturer());
        xiaoeLiveDTO.setPaymentType(dto.getLiveType()==1?1:3);
        xiaoeLiveDTO.setResourcePassword(dto.getResourcePassword());
        xiaoeLiveDTO.setDescrb(dto.getLiveDetail());
        String goslingLiveId = xiaoeUtils.addLive(xiaoeLiveDTO);
        dto.setGoslingLiveId(goslingLiveId);
//        XiaoeLiveDTO xiaoeLiveDTO = new XiaoeLiveDTO();
//        xiaoeLiveDTO.setTitle(dto.getLiveTitle());
//        xiaoeLiveDTO.setSummary(dto.getLiveIntroduction());
//        xiaoeLiveDTO.setZbStartAt(DateUtils.localDateTimeToString(dto.getStartTime()));
//        xiaoeLiveDTO.setZbStopAt(dto.getExpectedDuration());
//        // 直播类型 0-语音，1-录播直播，2-推流直播，默认为0-语音直播
//        xiaoeLiveDTO.setAliveType(2);
//        xiaoeLiveDTO.setAliveMode(dto.getLiveMode()==1?0:1);
//        xiaoeLiveDTO.setUserId(dto.getLiveLecturer());
//        xiaoeLiveDTO.setPaymentType(dto.getLiveType()==1?1:3);
//        xiaoeLiveDTO.setResourcePassword(dto.getResourcePassword());
//        xiaoeLiveDTO.setDescrb(dto.getLiveDetail());
//        String goslingLiveId = xiaoeUtils.addLive(xiaoeLiveDTO);
//        dto.setGoslingLiveId(goslingLiveId);

        return R.ok(sysLiveService.save(dto));
    }
@@ -136,19 +136,19 @@
        dto.setEndTime(dto.getStartTime().plusMinutes(dto.getExpectedDuration()));

        // 编辑小鹅通直播
        XiaoeLiveDTO xiaoeLiveDTO = new XiaoeLiveDTO();
        xiaoeLiveDTO.setTitle(dto.getLiveTitle());
        xiaoeLiveDTO.setSummary(dto.getLiveIntroduction());
        xiaoeLiveDTO.setZbStartAt(DateUtils.localDateTimeToString(dto.getStartTime()));
        xiaoeLiveDTO.setZbStopAt(dto.getExpectedDuration());
        // 直播类型 0-语音，1-录播直播，2-推流直播，默认为0-语音直播
        xiaoeLiveDTO.setAliveType(2);
        xiaoeLiveDTO.setAliveMode(dto.getLiveMode()==1?0:1);
        xiaoeLiveDTO.setUserId(dto.getLiveLecturer());
        xiaoeLiveDTO.setPaymentType(dto.getLiveType()==1?1:3);
        xiaoeLiveDTO.setResourcePassword(dto.getResourcePassword());
        xiaoeLiveDTO.setDescrb(dto.getLiveDetail());
        xiaoeUtils.editLive(xiaoeLiveDTO);
//        XiaoeLiveDTO xiaoeLiveDTO = new XiaoeLiveDTO();
//        xiaoeLiveDTO.setTitle(dto.getLiveTitle());
//        xiaoeLiveDTO.setSummary(dto.getLiveIntroduction());
//        xiaoeLiveDTO.setZbStartAt(DateUtils.localDateTimeToString(dto.getStartTime()));
//        xiaoeLiveDTO.setZbStopAt(dto.getExpectedDuration());
//        // 直播类型 0-语音，1-录播直播，2-推流直播，默认为0-语音直播
//        xiaoeLiveDTO.setAliveType(2);
//        xiaoeLiveDTO.setAliveMode(dto.getLiveMode()==1?0:1);
//        xiaoeLiveDTO.setUserId(dto.getLiveLecturer());
//        xiaoeLiveDTO.setPaymentType(dto.getLiveType()==1?1:3);
//        xiaoeLiveDTO.setResourcePassword(dto.getResourcePassword());
//        xiaoeLiveDTO.setDescrb(dto.getLiveDetail());
//        xiaoeUtils.editLive(xiaoeLiveDTO);

        return R.ok(sysLiveService.updateById(dto));
    }

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmSalespersonAndBranchVO.java

New file
@@ -0,0 +1,22 @@
package com.ruoyi.system.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

@Data
@ApiModel(value = "业务员及分公司信息TCrmSalespersonAndBranchVO")
public class TCrmSalespersonAndBranchVO implements Serializable {

    @ApiModelProperty(value = "id")
    private String id;

    @ApiModelProperty(value = "名称")
    private String name;

    @ApiModelProperty(value = "类型 1=分公司 2=业务员")
    private Integer type;

}