diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDictResDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDictResDTO.java index 8b1cbdf94f..00f56ad3f9 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDictResDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GuideDictResDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -25,11 +26,13 @@ public class GuideDictResDTO implements Serializable { /** * 排序 */ + @JsonIgnore private Integer sort; /** * 状态 禁用disable 启用enable */ + @JsonIgnore private String status; } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java index 32e879790a..c876885d6c 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java @@ -81,7 +81,7 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl list = baseDao.selectPageByCid(Constant.DEFAULT_CUSTOMER); - int sort = 1; + int sort = 0; for (GuideCategoryDTO dto : list) { // 已经禁用的,不同步给客户 if (Constant.DISABLE.equals(dto.getStatus())) { diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml index 6af20116bc..08243e6558 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideCategoryDao.xml @@ -32,12 +32,12 @@ gc.category_code, gc.`STATUS`, gc.sort, - ( SELECT count( g.id ) FROM guide g WHERE g.CUSTOMER_ID = '' AND g.DEL_FLAG = '0' AND g.CATEGORY_CODE = gc.CATEGORY_CODE ) AS guideTotal + ( SELECT count( g.id ) FROM guide g WHERE g.CUSTOMER_ID = #{customerId} AND g.DEL_FLAG = '0' AND g.CATEGORY_CODE = gc.CATEGORY_CODE ) AS guideTotal FROM guide_category gc WHERE gc.DEL_FLAG = '0' - AND CUSTOMER_ID = 'default' + AND CUSTOMER_ID = #{customerId} ) temp WHERE temp.`STATUS` = 'enable'