6/29 xx

RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/InvalidProcessService.java

@@ -49,7 +49,7 @@ public class InvalidProcessService extends ServiceImpl<InvalidProcessMapper, Inv
         if(invalidProcessDTO.getOccuredTime() != null) {
             //判断无效事务的类型
             //获取当前登陆人信息
-//            PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+            PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
             //添加无效事务
             InvalidProcess invalidProcess = new InvalidProcess();
             //报告id
@@ -57,8 +57,8 @@ public class InvalidProcessService extends ServiceImpl<InvalidProcessMapper, Inv
             //发生时间
             invalidProcess.setOccuredTime(invalidProcessDTO.getOccuredTime());
             //创建人
-//            invalidProcess.setCreateId(personnelVO.getId());
-            invalidProcess.setCreateId(1);
+            invalidProcess.setCreateId(personnelVO.getId());
+//            invalidProcess.setCreateId(1);
             List<Integer> typeIds = new ArrayList<>();
             //1为无效请求书，2为陈述意见书，3为无效决定书，4为行政诉讼书
             typeIds.add(1);
@@ -77,8 +77,8 @@ public class InvalidProcessService extends ServiceImpl<InvalidProcessMapper, Inv
                     //参与人
                     oralExam.setParticipants(invalidProcessDTO.getParticipants());
                     //创建人
-//                    oralExam.setCreateId(personnelVO.getId());
-                    oralExam.setCreateId(1);
+                    oralExam.setCreateId(personnelVO.getId());
+//                    oralExam.setCreateId(1);
                     oralExam.insert();
                     //流程类型
                     invalidProcess.setProcessType(invalidProcessDTO.getProcessType());
@@ -118,11 +118,11 @@ public class InvalidProcessService extends ServiceImpl<InvalidProcessMapper, Inv
         lw.eq(InvalidProcess::getId, id);
         InvalidProcess invalidProcess = this.getOne(lw);
         if(invalidProcess != null){
-            invalidProcess.deleteById();
             //如果流程类型为0，则为口审记录
-            if(invalidProcess.getProcessType() == 0) {
+            if(invalidProcess.getProcessType().equals(0)) {
                 oralExamService.removeById(id);
             }
+            invalidProcess.deleteById();
         } else {
             throw new XiaoShiException("没有此条数据");
         }