#跟进任务

LSH

2023-10-10 a1f4599096beaa9cbbb24534bc608c73811db226

 src/main/java/com/zy/crm/manager/controller/BusinessTripController.java

@@ -100,7 +100,7 @@
    }

    @RequestMapping(value = "/businessTrip/add/auth")
    @ManagerAuth
    @ManagerAuth(memo = "添加出差申请")
    public R add(BusinessTrip businessTrip) {
        if (Cools.isEmpty(businessTrip)){
            return R.error();
@@ -142,7 +142,12 @@
        businessTrip.setStatus(0);
        businessTrip.setSettle(1);

        User manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
        User manager = new User();
        try{
            manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
        }catch (Exception e){
            manager = getUser();
        }

        businessTrip.setSettleMsg(JSON.toJSONString(SettleDto.initBusiness(manager,getUser())));

@@ -151,7 +156,7 @@
    }

   @RequestMapping(value = "/businessTrip/update/auth")
   @ManagerAuth
   @ManagerAuth(memo = "更新出差申请")
    public R update(BusinessTrip businessTrip){
        if (Cools.isEmpty(businessTrip) || null==businessTrip.getId()){
            return R.error();
@@ -189,7 +194,7 @@
    }

    @RequestMapping(value = "/businessTrip/delete/auth")
    @ManagerAuth
    @ManagerAuth(memo = "删除出差申请")
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            businessTripService.deleteById(id);
@@ -245,7 +250,12 @@
            case 1:
                // 本部门经理审核
                User user = userService.selectById(businessTrip.getUserId());
                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
                User manager = new User();
                try{
                    manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
                }catch (Exception e){
                    manager = user;
                }
                if (manager.getId().equals(getUserId())) {

                    // 修改 settle 步骤数据
@@ -268,6 +278,7 @@

                    // 修改规划单状态
                    businessTrip.setSettle(2);  // 申请通过
                    businessTrip.setStatus(1);
                    businessTrip.setUpdateId(getUserId());
                    businessTrip.setUpdateTime(now);
                    if (!businessTripService.updateById(businessTrip)) {