diff --git a/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml b/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml index b3a3de6..354010c 100644 --- a/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml @@ -66,6 +66,7 @@ sys_user_role ur on su.user_id = ur.user_id where su.deleted = 0 + and su.status = 1 and su.which_user_id = #{userId} and ur.role_code = #{roleCode} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/PushClueServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/PushClueServiceImpl.java index 81d3dc7..37021bc 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/PushClueServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/PushClueServiceImpl.java @@ -23,6 +23,7 @@ import com.baiye.modules.distribute.service.PushConfigService; import com.baiye.modules.distribute.vo.PushClueInfoVo; import com.baiye.util.AESUtils; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.ballcat.security.properties.SecurityProperties; @@ -58,7 +59,7 @@ public class PushClueServiceImpl extends ExtendServiceImpl