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

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/query/QueryInspectionFilePageListByWorkOrderIdService.java

@@ -153,7 +153,7 @@ public class QueryInspectionFilePageListByWorkOrderIdService {
             inspectionFileHandleVo.setLongitude(inspectionFile.getLongitude());
             inspectionFileHandleVo.setLocation(inspectionFile.getLocation());
             inspectionFileHandleVo.setFileThumbnail(CommonConfig.imageURL + inspectionFile.getFileThumbnail());
-
+            inspectionFileHandleVo.setFileOriginal(CommonConfig.imageURL + inspectionFile.getFileOriginal());
             questionType = questionTypeMap.get(inspectionFile.getQuestionCode());
             if (null != questionType) {
                 inspectionFileHandleVo.setQuestionCode(questionType.getCode());

tuoheng-service/tuoheng-admin/src/main/resources/mapper/WorkOrderMapper.xml

@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="request.status != null and request.status != ''"> and status = #{request.status} </if>
             <if test="request.userDeptId != null and request.userDeptId != ''"> and assign_dept_id = #{request.userDeptId} </if>
             <if test="request.deptIdList != null and request.deptIdList.size() > 0">
-                and dept_id in
+                or dept_id in
                 <foreach item="deptId" collection="request.deptIdList" open="(" separator="," close=")">
                     #{deptId}
                 </foreach>