Compare commits
5 Commits
9630b2c4c1
...
3d57a5c75e
| Author | SHA1 | Date |
|---|---|---|
|
|
3d57a5c75e | |
|
|
dc4f688111 | |
|
|
953450e02d | |
|
|
afa0075b67 | |
|
|
64685d2f05 |
|
|
@ -208,7 +208,7 @@
|
||||||
left join (
|
left join (
|
||||||
select group_concat(post_id) as postId,evaluate_id from pj_task_evaluated GROUP BY evaluate_id
|
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
|
)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 != ''">
|
<if test="evaluateDeptId != null and evaluateDeptId != ''">
|
||||||
and per.dept_id = #{evaluateDeptId}
|
and per.dept_id = #{evaluateDeptId}
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
|
|
@ -93,12 +93,12 @@
|
||||||
|
|
||||||
let keyList = []
|
let keyList = []
|
||||||
for (let key in item) {
|
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])
|
keyList.push(item[key])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const isAllNull = keyList.every(item => {
|
const isAllNull = keyList.every(item => {
|
||||||
return (item !== '' && item * 1 >= 0) || item.indexOf('file') > 0
|
return (item !== '' && item * 1 >= 0)
|
||||||
})
|
})
|
||||||
tableListNew.push({
|
tableListNew.push({
|
||||||
...item,
|
...item,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue