Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/dao/InspectionFileMapper.java

@@ -16,5 +16,5 @@ public interface InspectionFileMapper extends BaseMapper<InspectionFile> {
     //查询当前登录人处理问题总数
     Integer getInspectionFileCount(@Param("today") String s,@Param("userId") String id);
 
-    Integer getInspectionFileHandleCount(@Param("today") String s,@Param("userId") String id);
+    Integer getInspectionFileHandleCount(@Param("today") String s,@Param("tenantId") String id);
 }

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

@@ -86,6 +86,7 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
         //查询当前对应的任务
         Inspection inspection = inspectionMapper.selectOne(Wrappers.<Inspection>lambdaQuery()
                 .eq(Inspection::getId, query.getInspectionId())
+                .eq(Inspection::getTenantId,tenantId)
                 .eq(Inspection::getMark, 1));
         if (ObjectUtil.isNull(inspection)) {
             throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
@@ -127,6 +128,7 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
         //查询当前对应的任务
         Inspection inspection = inspectionMapper.selectOne(Wrappers.<Inspection>lambdaQuery()
                 .eq(Inspection::getId, query.getInspectionId())
+                .eq(Inspection::getTenantId,tenantId)
                 .eq(Inspection::getMark, 1));
         if (ObjectUtil.isNull(inspection)) {
             throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
@@ -169,6 +171,7 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
         //查询当前对应的任务
         Inspection inspection = inspectionMapper.selectOne(Wrappers.<Inspection>lambdaQuery()
                 .eq(Inspection::getId, query.getInspectionId())
+                .eq(Inspection::getTenantId,tenantId)
                 .eq(Inspection::getMark, 1));
         if (ObjectUtil.isNull(inspection)) {
             throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
@@ -362,6 +365,12 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
         if (null == user.getRoleId()) {
             throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
         }
+        //获取当前租户id
+        String tenantId = CurrentUserUtil.getTenantId();
+        if(StringUtils.isEmpty(tenantId)){
+            return JsonResult.error(InspectionFileEnum.TENANT_ID_IS_NULL.getCode(),InspectionFileEnum.TENANT_ID_IS_NULL.getMsg());
+        }
+
         //今日
         DateTime endTime = DateUtil.endOfDay(DateUtil.date());
         //一周前的时间
@@ -375,7 +384,7 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
                     InspectionFileCountVo vo = new InspectionFileCountVo();
                     vo.setCheckTime(s);
                     //查询当日登录用户的已处理问题总数,创建时间
-                    Integer num = inspectionFileMapper.getInspectionFileHandleCount(s, user.getId());
+                    Integer num = inspectionFileMapper.getInspectionFileHandleCount(s, tenantId);
                     if (null != num) {
                         vo.setInspectionHandleSum(num);
                     }

tuoheng-service/tuoheng-miniprogram/src/main/resources/mapper/InspectionFileMapper.xml

@@ -36,5 +36,6 @@
         from th_inspection_file
         where date_format(update_time, '%Y-%m-%d') = #{today}
         and mark = 1
+        and tenant_id = #{tenantId}
     </select>
 </mapper>