diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml index 6c1efbcb5..e8fbf82bd 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml @@ -29,8 +29,8 @@ SELECT ecr.id, ecr.name, ecr.mobile, - IF(ecr.CATEGORY=1,'居民','工作') category, - IF(ecr.SYSTEM=0,'正常','异常') system, + IF(ecr.CATEGORY='1','工作人员','居民') category, + IF(ecr.SYSTEM= '0','正常','异常') system, mo.DESCRIPTION as module, ecr.CONTENT, ecr.RATE, @@ -93,7 +93,7 @@ SELECT evr.id, evr.name, - IF(evr.CATEGORY=1,'居民','工作') category, + IF(evr.CATEGORY='1','工作人员','居民') category, mo.DESCRIPTION as module, evr.CONTENT, evr.RATE, la.DESCRIPTION as label, - IF(evr.DECISION=1,'系统判定','人工审核') decision, + IF(evr.DECISION='1','系统判定','人工审核') decision, date_format(evr.CREATED_TIME,'%Y-%m-%d %H:%m') as CREATED_TIME, date_format(evr.AUDIT_TIME,'%Y-%m-%d %H:%m') as AUDIT_TIME, img.URL diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java index 5a34e5d83..fb7b2657d 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java @@ -186,7 +186,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl