Merge remote-tracking branch 'origin/dev_hjj_522'

src/main/java/com/jsh/erp/controller/pda/PdaController.java

@@ -375,11 +375,11 @@ public class PdaController extends BaseController {
     @ApiOperation("设置复核任务状态")
     public AjaxResult setReviewStatus(@RequestBody PDADepotHeadDTO pdaDepotHeadDTO){
         Long userId = userService.getCurrentUser().getId();
-        DepotHead depotHead = depotHeadService.getDepotHead(pdaDepotHeadDTO.getId());
+        DepotHead depotHead = depotHeadService.getById(pdaDepotHeadDTO.getId());
         if (!depotHead.getStatus().equals("6")){
             return AjaxResult.error("该复核任务已被处理");
         }
-        if (depotHead.getCreator() == userId){
+        if (depotHead.getOperId().equals(userId)){
             return AjaxResult.error("提交人不能和复核人为同一账号");
         }
         boolean b = depotHeadService.setReviewStatus(pdaDepotHeadDTO);