From 89c6943973621c6dfc23844999245cc35ee477b4 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 07 Apr 2021 17:05:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/service/UserService.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/UserService.java b/screen-api/src/main/java/com/moral/api/service/UserService.java
index a514410..1b2961c 100644
--- a/screen-api/src/main/java/com/moral/api/service/UserService.java
+++ b/screen-api/src/main/java/com/moral/api/service/UserService.java
@@ -1,11 +1,13 @@
package com.moral.api.service;
-import java.util.List;
import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.User;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.moral.api.pojo.UserBO;
/**
* <p>
@@ -17,15 +19,18 @@
*/
public interface UserService extends IService<User> {
- Map<String, Object> login(Map<String,Object> parameters);
+ Map<String, Object> login(Map<String, Object> parameters);
- Map<String, Object> addUser(User user, Integer currentUserId);
+ Map<String, Object> getMenus(Map<String, Object> parameters);
- Map<String, Object> deleteUser(Integer userId, Integer currentUserId);
+ Map<String, Object> addUser(User user, String token);
- Map<String, Object> updateUser(User user, Integer currentUserId);
+ void deleteUser(User user);
- List<User> getUsersByOrgId(Integer currentUserId);
+ Map<String, Object> updateUser(User user, String token);
- User getUserById(Integer userId, Integer currentUserId);
+ Page<User> selectUsers(Map<String, Object> parameters);
+
+ UserBO selectUserInfo(Map<String, Object> parameters);
+
}
--
Gitblit v1.8.0