From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserCustomSettingsMapper.java | 73 +++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 30 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserCustomSettingsMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserCustomSettingsMapper.java
index 2b44dd3..2e8ddeb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserCustomSettingsMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserCustomSettingsMapper.java
@@ -1,31 +1,44 @@
-package com.yeshi.fanli.dao.mybatis.user;
-
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.bus.user.UserCustomSettings;
-
-public interface UserCustomSettingsMapper extends BaseMapper<UserCustomSettings> {
-
- /**
- * 鑾峰彇鎴戠殑鎵�鏈夎嚜瀹氫箟璁剧疆
- * @param uid
- * @return
- */
- List<UserCustomSettings> getSettingsByUid(Long uid);
-
- /**
- * 鑾峰彇璁剧疆淇℃伅
- * @param uid 鐢ㄦ埛id
- * @param type 绫诲瀷
- * @return
- */
- UserCustomSettings getSettingsByUidAndType(@Param("uid")Long uid, @Param("type")String type);
-
-
- List<Long> getUserID(@Param("type")String type);
-
+package com.yeshi.fanli.dao.mybatis.user;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.bus.user.UserCustomSettings;
+
+public interface UserCustomSettingsMapper extends BaseMapper<UserCustomSettings> {
+
+ /**
+ * 鑾峰彇鎴戠殑鎵�鏈夎嚜瀹氫箟璁剧疆
+ *
+ * @param uid
+ * @return
+ */
+ List<UserCustomSettings> getSettingsByUid(Long uid);
+
+ /**
+ * 鑾峰彇璁剧疆淇℃伅
+ *
+ * @param uid
+ * 鐢ㄦ埛id
+ * @param type
+ * 绫诲瀷
+ * @return
+ */
+ UserCustomSettings getSettingsByUidAndType(@Param("uid") Long uid, @Param("type") String type);
+
+ List<Long> getUserID(@Param("type") String type);
+
+ /**
+ * 閫氳繃鐢ㄦ埛ID锛岀被鍨嬶紝鐘舵�佹绱�
+ *
+ * @param uidList
+ * @param type
+ * @param state
+ * @return
+ */
+ List<UserCustomSettings> listByUidListAndTypeAndState(@Param("uidList") List<Long> uidList,
+ @Param("type") String type, @Param("state") Integer state);
+
}
\ No newline at end of file
--
Gitblit v1.8.0