处理bug

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElPassMarkconfigController.java

@@ -1,21 +1,22 @@
 package com.zd.exam.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.zd.model.domain.per.PerFun;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.common.core.utils.ExcelUtil;
-import com.zd.common.core.web.controller.BaseController;
-import com.zd.model.domain.AjaxResult;
-import com.zd.model.page.TableDataInfo;
 import com.zd.common.core.annotation.Log;
-import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.swagger.config.Knife4jConfiguration;
 import com.zd.exam.domain.ElPassConfigdetail;
 import com.zd.exam.domain.ElPassMarkconfig;
 import com.zd.exam.domain.vo.ElPassMarkconfigVO;
 import com.zd.exam.service.IElPassConfigdetailService;
 import com.zd.exam.service.IElPassMarkconfigService;
+import com.zd.model.domain.AjaxResult;
+import com.zd.model.domain.R;
+import com.zd.model.domain.per.PerFun;
+import com.zd.model.domain.per.PerPrefix;
+import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -149,7 +150,7 @@ public class ElPassMarkconfigController extends BaseController
      */
     @ApiOperation(value = "获取信用合格分设置")
     @RequestMapping("/getPointsConfig")
-    public AjaxResult getPointsConfig(@RequestBody Map <String,Object> recoveryMap)
+    public R getPointsConfig(@RequestBody Map <String,Object> recoveryMap)
     {
         ElPassMarkconfig elPassMarkconfig = new ElPassMarkconfig();
         List<ElPassMarkconfigVO> list = elPassMarkconfigService.selectElPassMarkconfigList(elPassMarkconfig);
@@ -160,6 +161,6 @@ public class ElPassMarkconfigController extends BaseController
             passMarkconfig.setConfigDetailList(passConfigdetails);
         }
 
-        return AjaxResult.success(list.get(0));
+        return R.ok(list.get(0));
     }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/utils/InblackListScheduleTask.java

@@ -64,6 +64,9 @@ public class InblackListScheduleTask {
                 List <LabNegativelistHistory> labNegativelistHistoryList = (List <LabNegativelistHistory>) list.getData();
                 for (LabNegativelistHistory history : labNegativelistHistoryList) {
 
+                    if(history.getCreditScore() == null || pointsConfig.get("blackScore") == null){
+                        continue;
+                    }
                     Long deducPoints = history.getCreditScore() - Long.parseLong(pointsConfig.get("blackScore")+"");
                     if(deducPoints>0){
                         //这里扣减信用分