|
@@ -474,23 +474,23 @@
|
|
|
</update>
|
|
|
|
|
|
<select id="selectAppTodo" resultMap="BaseResultMap">
|
|
|
- select id,task_no,send_time,address,order_type_id,create_by,update_by
|
|
|
+ select id,task_no,send_time,address,order_type_id,create_by,update_by,task_desc
|
|
|
from sc_work_order_manage
|
|
|
where find_in_set(#{userId},current_users) and tenant_id = #{tenantId}
|
|
|
union
|
|
|
- select id,plan_id,plan_start_date,task_area_name,task_type,create_by,update_by
|
|
|
+ select id,plan_id,plan_start_date,task_area_name,task_type,create_by,update_by,task_content
|
|
|
from sc_plan_manage
|
|
|
where find_in_set(#{userId},current_users) and tenant_id = #{tenantId}
|
|
|
order by send_time
|
|
|
</select>
|
|
|
<select id="selectAppAll" resultMap="BaseResultMap">
|
|
|
- select id,task_no,send_time,address,order_type_id,current_task_name,create_by,update_by
|
|
|
+ select id,task_no,send_time,address,order_type_id,current_task_name,create_by,update_by,task_desc
|
|
|
from sc_work_order_manage
|
|
|
where (find_in_set(#{userId},current_users)
|
|
|
or id in(select flow_id from sc_work_flow_log where flow_type=2 and find_in_set(#{userId},handle_user_id)))
|
|
|
and tenant_id = #{tenantId}
|
|
|
union
|
|
|
- select id,plan_id,plan_start_date,task_area_name,task_type,current_task_name,create_by,update_by
|
|
|
+ select id,plan_id,plan_start_date,task_area_name,task_type,current_task_name,create_by,update_by,task_content
|
|
|
from sc_plan_manage
|
|
|
where (find_in_set(#{userId},current_users)
|
|
|
or id in(select flow_id from sc_work_flow_log where flow_type=1 and find_in_set(#{userId},handle_user_id)))
|