Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileServiceImpl.java

@@ -194,11 +194,13 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
     @Override
     public JsonResult questionIdentification(QuestionIdentificationDto dto) {
         if (StringUtils.isEmpty(dto.getId())) return JsonResult.error("问题id不存在");
+        //获取当前登录用户的租户id
+        String tenantId = CurrentUserUtil.getTenantId();
         //查询任务此问题
         InspectionFile inspectionFile = inspectionFileMapper.selectOne(Wrappers.<InspectionFile>lambdaQuery()
                 .eq(InspectionFile::getId, dto.getId())
                 .eq(InspectionFile::getMark, 1)
-                .eq(StringUtils.isNotEmpty(dto.getTenantId()), InspectionFile::getTenantId, dto.getTenantId()));
+                .eq(StringUtils.isNotEmpty(dto.getTenantId()), InspectionFile::getTenantId, tenantId));
         //修改对应的问题类型
         inspectionFile.setQuestionId(dto.getQuestionId());
         int count = inspectionFileMapper.updateById(inspectionFile);
@@ -297,7 +299,7 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
             String getHandlerImage = getMultipleUrl(vo.getHandlerImage());
             vo.setHandlerImage(getHandlerImage);
         }
-        //处理人员返回username
+        //处理人员返回realname
         String handleUserId = vo.getHandlerUser();
         if(StringUtils.isNotEmpty(handleUserId)){
             User user = userMapper.selectById(handleUserId);