xiaofei 2 роки тому
батько
коміт
f4560b1a3f

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TSyncStmmsExamServiceImpl.java

@@ -62,7 +62,7 @@ public class TSyncStmmsExamServiceImpl extends ServiceImpl<TSyncStmmsExamMapper,
         updateWrapper.lambda().eq(TSyncStmmsExam::getSchoolId, schoolId);
         this.remove(updateWrapper);
 
-        String orgCodeTrim = "".equals(orgCode.trim()) ? null : orgCode.trim();
+        String orgCodeTrim = StringUtils.isBlank(orgCode) ? null : orgCode.trim();
 
         List<JSONObject> objectList = cloudMarkingTaskUtils.getExam(schoolId, orgCodeTrim, SystemConstant.PAGE_NUMBER_MIN, SystemConstant.PAGE_SIZE);
         if (objectList.isEmpty()) {

+ 4 - 0
distributed-print-business/src/main/resources/db/3.2.3更新脚本-增量.sql

@@ -58,6 +58,10 @@ ALTER TABLE `t_sync_exam_student_score` ADD COLUMN `paper_number` VARCHAR(45) NU
 
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('865', '共用接口-查询班级', '/api/admin/basic/condition/list_clazz', 'URL', '149', '13', 'SYS', '1', '1', '1');
 
+UPDATE `sys_privilege` SET `related` = '395,435,557,792,793' WHERE (`id` = '397');
+UPDATE `sys_privilege` SET `related` = '395,435,557,792,793' WHERE (`id` = '394');
+UPDATE `sys_privilege` SET `name` = '数据推送管理' WHERE (`id` = '392');
+
 
 /*王亮新增*/
 INSERT INTO sys_role

+ 1 - 1
distributed-print/src/main/java/com/qmth/distributed/print/api/ConditionController.java

@@ -48,7 +48,7 @@ public class ConditionController {
     @RequestMapping(value = "/list_exam", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = BasicCollegeResult.class)})
     public Result listExam(@ApiParam(value = "学期ID") @RequestParam(required = false) Long semesterId,
-                           @ApiParam(value = "启用/禁用") @RequestParam(required = false) Boolean enable) {
+                           @ApiParam(value = "启用/禁用") @RequestParam(required = false, defaultValue = "true") Boolean enable) {
         return ResultUtil.ok(conditionService.listExam(semesterId, enable));
     }