Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

无关风月

2025-02-28 3a19a4973d770ec98b85bb90391500b7fd55bc1b

Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

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

@@ -64,7 +64,8 @@
    @ApiOperation(value = "获取部门管理列表")
    @PostMapping(value = "/list")
    public R<List<TDept>> list() {
        return R.ok(deptService.list());
        return R.ok(deptService.list(Wrappers.lambdaQuery(TDept.class)
                .eq(TDept::getStatus, 1)));
    }

    /**

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java

@@ -384,8 +384,8 @@
        int failNum = 0;
        for (String billId : dto.getBillIds()) {
            TBillDto bill = getDetailByBillId(billId);
            if (bill.getSmsLastTime()!=null
                    && (System.currentTimeMillis()-bill.getSmsLastTime().getTime()<mailUtil.getPro().getBillSmsDelayPeriod()*60*1000L)){
            if (bill.getSmsLastTime()!=null && bill.getSmsStatus()==1
                    && (System.currentTimeMillis()-bill.getSmsLastTime().getTime()<smsUtil.getPro().getBillSmsDelayPeriod()*60*1000L)){
                throw new ServiceException("有账单最近一次发送的时间是:"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,bill.getSmsLastTime()));
            }
            if (StringUtils.isEmpty(bill.getPhone())){
@@ -413,7 +413,7 @@
        int failNum = 0;
        for (String billId : dto.getBillIds()) {
            TBillDto bill = getDetailByBillId(billId);
            if (bill.getMailLastTime()!=null
            if (bill.getMailLastTime()!=null && bill.getMailStatus()==1
                    && (System.currentTimeMillis()-bill.getMailLastTime().getTime()<mailUtil.getPro().getBillMailDelayPeriod()*60*1000L)){
                throw new ServiceException("有账单最近一次发送的时间是:"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,bill.getMailLastTime()));
            }