From b9fa1c266e2d51388a757cf361680d82f6edfbea Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 08 十二月 2025 15:49:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java
index 5da45ca..fc5fc75 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java
@@ -2,13 +2,13 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.example.erp.controller.dto.UserDTO;
import com.example.erp.entity.userInfo.User;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
@Mapper
@@ -18,6 +18,8 @@
User findOne(Integer id);
User findOneLoginName(String LoginName);
+
+ User findOnePassWord(Integer id,String passWord);
@Select("select count(id) FROM `user` where login_name=#{userName} and password=#{password} ")
int checkUser(@Param("userName") String userName,@Param("password") String password);
@@ -28,4 +30,18 @@
Boolean register(User user);
List<String> getUserRole(Integer id);
+
+ Boolean userDelete(Integer id);
+
+ Boolean updatePassWordById(Integer id,String passWord);
+
+ Boolean updateUserNameById(Integer id,String userName);
+
+ Boolean updateProcessMp(Integer id, String process);
+
+ List<User> findByAddress(String userName);
+
+ String selectOptimizeParmsById(@Param("username") String username);
+
+ List<Map<String, Object>> getUserLog();
}
--
Gitblit v1.8.0