From 6661232f32135d943c76197afba2baac81e171f4 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 18 七月 2025 12:00:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 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 c048e1c..ac9a6a0 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
@@ -1,7 +1,7 @@
 package com.example.erp.mapper.userInfo;
 
 
-import com.example.erp.controller.dto.UserDTO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.erp.entity.userInfo.User;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -11,12 +11,14 @@
 
 @Mapper
 
-public interface UserMapper {
+public interface UserMapper extends BaseMapper<User> {
     List<User> findAll();
 
     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);
 
@@ -25,4 +27,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);
 }

--
Gitblit v1.8.0