liux
/
gs_sub_evaluate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: liux:3d57a5c75e68cf1b20c0956d1ca3f5c5c9618342
Branches Tags
liux:master
..
compare: liux:9630b2c4c195553dd3bf9a52bb5b1ce67a1b8cac
Branches Tags
liux:master

No commits in common. "3d57a5c75e68cf1b20c0956d1ca3f5c5c9618342" and "9630b2c4c195553dd3bf9a52bb5b1ce67a1b8cac" have entirely different histories.
3d57a5c75e ... 9630b2c4c1

2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml
View File

@ -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) where per.is_active = 1 and FIND_IN_SET(#{deptId},task.postId) and poi.id = #{userDeptId}
<if test="evaluateDeptId != null and evaluateDeptId != ''"> <if test="evaluateDeptId != null and evaluateDeptId != ''">
and per.dept_id = #{evaluateDeptId} and per.dept_id = #{evaluateDeptId}
</if> </if>

4
src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditForm.html
View File

@ -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 && !key.includes('file') ) { if (key.indexOf('-') > 0 && key.split('-').length - 1 >= 2) {
keyList.push(item[key]) keyList.push(item[key])
} }
} }
const isAllNull = keyList.every(item => { const isAllNull = keyList.every(item => {
return (item !== '' && item * 1 >= 0) return (item !== '' && item * 1 >= 0) || item.indexOf('file') > 0
}) })
tableListNew.push({ tableListNew.push({
...item, ...item,