恢复代码

unis-plugin/unis-plugin-biz/src/main/java/com/unis/lawEnforcementSupervision/modular/lesJointInspectionTask/service/impl/LesJointInspectionTaskServiceImpl.java

@@ -179,23 +179,28 @@ public class LesJointInspectionTaskServiceImpl extends ServiceImpl<LesJointInspe
     private void audit(LesJointInspectionTask lesJointInspectionTask) {
         // 状态 0：保存状态；1：发布（申请中）；2：审核通过；3：驳回
         Integer status = lesJointInspectionTask.getStatus();
-        if (1 == status) {
-            // 判断驳回在提交
-            QueryWrapper<AuditRequest> wrapper = new QueryWrapper<>();
-            wrapper.lambda().eq(AuditRequest::getRequestId, lesJointInspectionTask.getId());
-            AuditRequest request1 = auditRequestMapper.selectOne(wrapper);
-            if (ObjectUtils.isEmpty(request1)) {
-                // 添加审批(状态 0：待审核；1：已审核；2：驳回)
-                AuditRequest request = this.addAuditRequest(lesJointInspectionTask);
-                // 添加审批流程记录
-                this.addAuditRecord(lesJointInspectionTask, request.getId(), 0);
-            } else {
-                this.editAuditRequest(lesJointInspectionTask, 0);
+        // 直接提交
+        if (StringUtils.isEmpty(lesJointInspectionTask.getId()) && 1 == status) {
+            // 添加审批(状态 0：待审核；1：已审核；2：驳回)
+            AuditRequest request = this.addAuditRequest(lesJointInspectionTask);
+            // 添加审批流程记录
+            this.addAuditRecord(lesJointInspectionTask, request.getId(), 0);
+        } else {
+            if (1 == status) {
+                // 判断驳回在提交
+                if (StringUtils.isEmpty(lesJointInspectionTask.getId())) {
+                    // 添加审批(状态 0：待审核；1：已审核；2：驳回)
+                    AuditRequest request = this.addAuditRequest(lesJointInspectionTask);
+                    // 添加审批流程记录
+                    this.addAuditRecord(lesJointInspectionTask, request.getId(), 0);
+                } else {
+                    this.editAuditRequest(lesJointInspectionTask, 0);
+                }
+            } else if (2 == status) {
+                this.editAuditRequest(lesJointInspectionTask, 1);
+            } else if (3 == status) {
+                this.editAuditRequest(lesJointInspectionTask, 2);
             }
-        } else if (2 == status) {
-            this.editAuditRequest(lesJointInspectionTask, 1);
-        } else if (3 == status) {
-            this.editAuditRequest(lesJointInspectionTask, 2);
         }
     }