Merge remote-tracking branch 'origin/develop' into develop

tuoheng-admin/src/main/java/com/tuoheng/admin/controller/AliyunOssController.java

@@ -84,7 +84,7 @@ public class AliyunOssController {
             log.info("Access Key Secret: " + response.getCredentials().getAccessKeySecret());
             log.info("Security Token: " + response.getCredentials().getSecurityToken());
             log.info("RequestId: " + response.getRequestId());
-            return JsonResult.success(response);
+            return JsonResult.success(response.getCredentials());
         } catch (ClientException e) {
             log.error("Error code: " + e.getErrCode());
             log.error("Error message: " + e.getErrMsg());

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/WorkOrderServiceImpl.java

@@ -159,13 +159,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 .eq(WorkOrderQuestion::getWorkOrderId, request.getWorkOrderId())
                 .eq(WorkOrderQuestion::getQuestionId, request.getQuestionId()));
 
-        //修改问题处理结果表
+        //问题处理结果表新增
         QuestionHandle questionHandle = new QuestionHandle();
         BeanUtils.copyProperties(request, questionHandle);
         questionHandle.setHandlerUser(ShiroUtils.getUserId());
         questionHandle.setHandlerTime(new Date());
-        questionHandleMapper.update(questionHandle, new LambdaQueryWrapper<QuestionHandle>()
-                .eq(QuestionHandle::getQuestionId, request.getQuestionId()));
+        questionHandleMapper.insert(questionHandle);
 
         //查询工单下待处理的问题，如全部处理完，将工单状态修改为已完成
         Integer count = workOrderQuestionMapper.selectCount(new LambdaQueryWrapper<WorkOrderQuestion>()