Compare commits

..

5 Commits

2 changed files with 3 additions and 3 deletions

View File

@ -208,7 +208,7 @@
left join (
select group_concat(post_id) as postId,evaluate_id from pj_task_evaluated GROUP BY evaluate_id
)task on task.evaluate_id = per.evaluate_id
where per.is_active = 1 and FIND_IN_SET(#{deptId},task.postId) and poi.id = #{userDeptId}
where per.is_active = 1 and FIND_IN_SET(#{deptId},task.postId)
<if test="evaluateDeptId != null and evaluateDeptId != ''">
and per.dept_id = #{evaluateDeptId}
</if>

View File

@ -93,12 +93,12 @@
let keyList = []
for (let key in item) {
if (key.indexOf('-') > 0 && key.split('-').length - 1 >= 2) {
if (key.indexOf('-') > 0 && key.split('-').length - 1 >= 2 && !key.includes('file') ) {
keyList.push(item[key])
}
}
const isAllNull = keyList.every(item => {
return (item !== '' && item * 1 >= 0) || item.indexOf('file') > 0
return (item !== '' && item * 1 >= 0)
})
tableListNew.push({
...item,