Merge remote-tracking branch 'origin/master'

zengh

2021-08-13 05d218bdda3f09aa5d057fda916f5f0b668fb720

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/permit/controller/PermitController.java

@@ -89,6 +89,7 @@
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入permit")
    public R<IPage<Permit>> list(Permit permit, Query query) {
        permit.setStorage("1");
        IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit));
        return R.data(pages);
    }
@@ -111,11 +112,9 @@
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入permit")
    public R save(@Valid @RequestBody Permit permit) {
        BladeUser user = AuthUtil.getUser();
        permit.setType("2");
        permit.setStorage("1");
        permit.setPermitime(new Date());
        permit.setDeptid(user.getDeptId());
        return R.status(permitService.save(permit));
    }


 src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java

@@ -168,6 +168,7 @@
                trainingRegistration1.setIsExam(1);
                trainingRegistration1.setTrainingTime(new Date());
                trainingRegistration1.setUserId(userId);
                trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
                trainingRegistrationService.save(trainingRegistration1);
                //修改保安报名状态
                user.setIsTrain(1);
@@ -180,6 +181,7 @@
                    trainingRegistration1.setIsExam(1);
                    trainingRegistration1.setTrainingTime(new Date());
                    trainingRegistration1.setUserId(userId);
                    trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
                    trainingRegistrationService.save(trainingRegistration1);
                    //修改保安报名状态
                    user.setIsTrain(1);