Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/workorder/QueryWorkOrderPageListRequest.java

     /**
      * 工单生成开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date beginTime;
 
     /**
      * 工单生成结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 

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

             <if test="1 == 1"> and mark = 1 </if>
             <if test="request.code != null and request.code != 0"> and code = #{request.code} </if>
             <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">
-                or dept_id in
-                <foreach item="deptId" collection="request.deptIdList" open="(" separator="," close=")">
-                    #{deptId}
-                </foreach>
+            <if test="(request.userDeptId != null and request.userDeptId != '') or (request.deptIdList != null and request.deptIdList.size() > 0)">
+                and (
+                <trim prefixOverrides="or">
+                    <if test="(request.userDeptId != null and request.userDeptId != '')">
+                        or assign_dept_id = #{request.userDeptId}
+                    </if>
+                    <if test="request.deptIdList != null and request.deptIdList.size() > 0">
+                        or dept_id in
+                        <foreach item="deptId" collection="request.deptIdList" open="(" separator="," close=")">
+                            #{deptId}
+                        </foreach>
+                    </if>
+                </trim>
+                )
             </if>
             <if test="request.beginTime != null">
-                and check_time &gt;= #{request.beginTime}
+                and create_time &gt;= #{request.beginTime}
             </if>
             <if test="request.endTime != null">
-                and check_time &lt;= #{request.endTime}
+                and create_time &lt;= #{request.endTime}
             </if>
         </where>
         order by create_time desc