Browse Source

20230926-修改细节

iaun 3 years ago
parent
commit
5ed4002fe0

+ 1 - 0
src/main/java/cn/iaun/it/controller/ItItsmController.java

@@ -238,6 +238,7 @@ public class ItItsmController {
                         return new Result<>(ResultCode.OPERATION_NOT_PERMITTED);
                     }
                     ItItsmTemplate template = itItsmService.getItsmTemplateByTemplateId(dbData.getTemplateId());
+                    updateData.setOrderStatus(0);
                     updateData.setCurrentUserId(template.getTemplateUser());
                     updateData.setData(submitOrderReqVo.getData());
                     log.setLog("重新提交");

+ 2 - 1
src/main/resources/mapper/ItItsmOrderMapper.xml

@@ -33,10 +33,11 @@
         <if test="processed">
             `order_status` = 0
             and `order_id` IN (select distinct `il`.`order_id` from `it_itsm_log` `il` where `il`.`user_id` =
-            #{user_id})
+            #{userId})
         </if>
         <if test="!processed">
             `current_user_id` = #{userId}
+            AND `order_status` != 3
         </if>
         order by `create_time` desc
     </select>