#

LSH

2023-10-17 fabb29dfd7fdcc19727c459c8ef309a86d73ed09

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

@@ -56,7 +56,7 @@
        EntityWrapper<BusinessTrip> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
//        wrapper.or().eq("member_id",getUserId());
        wrapper.or().eq("member_id",getUserId());
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(businessTripService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -150,6 +150,8 @@
        }

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

        businessTrip.setMemberId(manager.getId());

        businessTripService.insert(businessTrip);
        return R.ok();
@@ -281,6 +283,7 @@
                    businessTrip.setStatus(1);
                    businessTrip.setUpdateId(getUserId());
                    businessTrip.setUpdateTime(now);
                    businessTrip.setMemberId(businessTrip.getUserId());
                    if (!businessTripService.updateById(businessTrip)) {
                        throw new CoolException("审核失败，请联系管理员");
                    }