隐患考评调整
parent
c887487d86
commit
817f3f2d9c
|
|
@ -75,7 +75,7 @@ public class HiddenEvaluationRecordQueryExe {
|
||||||
if(corpInfoRepository.checkCorp()){
|
if(corpInfoRepository.checkCorp()){
|
||||||
checkKey = AuthContext.getTenantId().toString();
|
checkKey = AuthContext.getTenantId().toString();
|
||||||
}else{*/
|
}else{*/
|
||||||
String checkKey = AuthContext.getTenantId() + "-" + AuthContext.getUserId();
|
String checkKey = AuthContext.getUserId().toString();
|
||||||
|
|
||||||
examCenterCOS.forEach(co -> {
|
examCenterCOS.forEach(co -> {
|
||||||
if (co.getCheckUserId() != null && co.getCheckUserId().contains(checkKey)) {
|
if (co.getCheckUserId() != null && co.getCheckUserId().contains(checkKey)) {
|
||||||
|
|
|
||||||
|
|
@ -55,8 +55,8 @@
|
||||||
<!-- 不做额外过滤 -->
|
<!-- 不做额外过滤 -->
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
order by ec.create_time desc
|
order by CASE WHEN ci.type = 2 THEN 0 ELSE 1 END,
|
||||||
|
ci.corp_order ASC;
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="listAll" resultType="com.zcloud.hidden.evaluation.persistence.dataobject.EvaluationConfigDO">
|
<select id="listAll" resultType="com.zcloud.hidden.evaluation.persistence.dataobject.EvaluationConfigDO">
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@
|
||||||
), ''
|
), ''
|
||||||
) AS noEvaluationMembers,
|
) AS noEvaluationMembers,
|
||||||
COALESCE(
|
COALESCE(
|
||||||
(SELECT GROUP_CONCAT(DISTINCT CONCAT(usr.corpinfo_id, '-', usr.id))
|
(SELECT GROUP_CONCAT(DISTINCT CONCAT(usr.id))
|
||||||
FROM evaluation_config ec
|
FROM evaluation_config ec
|
||||||
LEFT JOIN user usr ON ec.user_id = usr.id
|
LEFT JOIN user usr ON ec.user_id = usr.id
|
||||||
WHERE ec.corpinfo_id = h.corp_id
|
WHERE ec.corpinfo_id = h.corp_id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue