From 27b3352a6a7f514c98cce083eded6c3bb9e3f519 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 15 一月 2025 10:50:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java |   15 ++++++++++++++-
 1 files changed, 14 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 c644d7a..1ee4995 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,7 +2,6 @@
 
 
 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;
@@ -18,6 +17,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);
 
@@ -26,4 +27,16 @@
 
 
     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);
 }

--
Gitblit v1.8.0