diff --git a/app/admin/api/system/dept.go b/app/admin/api/system/dept.go
index 008d2d51d57d062da88f7d4063fd9cfb2713ba4a..67baa87e74335773a77c702cbaf49894ac708015 100644
--- a/app/admin/api/system/dept.go
+++ b/app/admin/api/system/dept.go
@@ -1,14 +1,15 @@
 package system
 
 import (
-	"github.com/gin-gonic/gin"
-	"github.com/wxnacy/wgo/arrays"
 	"net/http"
 	"ruoyi-go/app/admin/model/system"
 	"ruoyi-go/app/admin/model/tools"
 	"ruoyi-go/utils"
 	"ruoyi-go/utils/R"
 	"strconv"
+
+	"github.com/gin-gonic/gin"
+	"github.com/wxnacy/wgo/arrays"
 )
 
 func ListDept(context *gin.Context) {
@@ -50,7 +51,15 @@ func ListDept(context *gin.Context) {
 /*排除节点*/
 func ExcludeDept(context *gin.Context) {
 	deptId := context.Param("deptId")
-	var param = tools.SearchTableDataParam{}
+	var param = tools.SearchTableDataParam{
+		Other: system.SysDept{
+			DeptId:   0,
+			ParentId: 0,
+			DeptName: "",
+			Status:   "",
+		},
+	}
+	//fmt.Printf("ExcludeDeptParam:%v\n", param)
 	var list, _ = system.GetDeptList(param, false)
 	var ExcludeList []system.SysDeptResult
 	for i := 0; i < len(list); i++ {
diff --git a/app/admin/api/system/user.go b/app/admin/api/system/user.go
index 1f1e4d49ba25bd0e6e22896b4ee81297b3cb87ee..65b76ff79cfac63a3dc1ad88d2dd4cc6ac38098a 100644
--- a/app/admin/api/system/user.go
+++ b/app/admin/api/system/user.go
@@ -165,7 +165,7 @@ func CaptchaImageHandler(context *gin.Context) {
 // UpdatePwdHandler 修改密码
 func UpdatePwdHandler(context *gin.Context) {
 	userId, _ := context.Get("userId")
-	var user = system.FindUserById(userId)
+	var user = system.FindUserByIdWithPass(userId)
 	var newPassword1, _ = context.GetPostForm("newPassword")
 	println(newPassword1)
 	// 没有这个，下面的为空很奇怪
diff --git a/app/admin/model/system/sysRoles.go b/app/admin/model/system/sysRoles.go
index 2141cee282f6ae25e1ea0dda12fb8234d9380d9d..dfd0f432e2202aa09beb96643e1800852610b93a 100644
--- a/app/admin/model/system/sysRoles.go
+++ b/app/admin/model/system/sysRoles.go
@@ -489,8 +489,7 @@ func GetAllocatedList(params tools.SearchTableDataParam) tools.TableDataInfo {
 	var total int64
 	var rows []SysUser
 
-	sql := "select distinct u.* " +
-		"from sys_user u left join sys_dept d on u.dept_id = d.dept_id " +
+	sql := "from sys_user u left join sys_dept d on u.dept_id = d.dept_id " +
 		"left join sys_user_role ur on u.user_id = ur.user_id " +
 		"left join sys_role r on r.role_id = ur.role_id " +
 		"where u.del_flag = '0' and r.role_id = " + strconv.Itoa(sysUser.RoleId)
@@ -512,11 +511,11 @@ func GetAllocatedList(params tools.SearchTableDataParam) tools.TableDataInfo {
 		sql += "u.create_time <= " + endTime1.String()
 	}
 	var db = mysql.MysqlDb().Model(&rows)
-	if err := db.Count(&total).Error; err != nil {
+	if err := db.Raw("select count(*) " + sql).Count(&total).Error; err != nil {
 		return tools.Fail()
 	}
 
-	if err := db.Raw(sql).Limit(pageSize).Offset(offset).Find(&rows).Error; err != nil {
+	if err := db.Raw("select distinct u.* " + sql).Limit(pageSize).Offset(offset).Find(&rows).Error; err != nil {
 		return tools.Fail()
 	}
 
diff --git a/app/admin/model/system/sysUser.go b/app/admin/model/system/sysUser.go
index 5e3779471096e0e17b18ecf24be8c3d450823481..8ab9444f03397424a0645dbacadb0a7ec7a661c4 100644
--- a/app/admin/model/system/sysUser.go
+++ b/app/admin/model/system/sysUser.go
@@ -155,6 +155,12 @@ func FindUserByName(loginName string) SysUser {
 }
 
 func FindUserById(id any) SysUser {
+	user := FindUserByIdWithPass(id)
+	user.Password = ""
+	return user
+}
+
+func FindUserByIdWithPass(id any) SysUser {
 	userId := utils.GetInterfaceToInt(id)
 	if userId < 1 {
 		panic(R.ReturnFailMsg("获取用户信息失败"))
@@ -168,7 +174,6 @@ func FindUserById(id any) SysUser {
 	if err != nil {
 		panic(R.ReturnFailMsg(err.Error()))
 	}
-	user.Password = ""
 	return user
 }
 
@@ -416,7 +421,7 @@ func ImportUserData(users []SysUserParm, updateSupport string) (string, string)
 func SaveUser(user SysUserParm) string {
 	var result = ""
 	var u = SysUser{
-		NickName:    user.UserName,
+		NickName:    user.NickName,
 		DeptId:      user.DeptId,
 		UserName:    user.UserName,
 		UserType:    "00",
diff --git a/frontend/ruoyi-ui/package.json b/frontend/ruoyi-ui/package.json
index 6466e57d086dbf7656ec82fc8c11de60e5fa3aad..906b7a01bd6ba1bcca6900c0621862bfc9cccded 100644
--- a/frontend/ruoyi-ui/package.json
+++ b/frontend/ruoyi-ui/package.json
@@ -5,10 +5,8 @@
   "author": "若依",
   "license": "MIT",
   "scripts": {
-    "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
-    "build:prod": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "dev-mac": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
-    "build-mac:prod": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "dev": "vue-cli-service serve",
+    "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
diff --git a/frontend/ruoyi-ui/src/views/system/role/authUser.vue b/frontend/ruoyi-ui/src/views/system/role/authUser.vue
index 147aa33e43cf22f2685dc8197eec1bdf936b56d0..df0b278f87858a00bfd27b6e7dad86279bdef6ae 100644
--- a/frontend/ruoyi-ui/src/views/system/role/authUser.vue
+++ b/frontend/ruoyi-ui/src/views/system/role/authUser.vue
@@ -175,7 +175,9 @@ export default {
     },
     /** 取消授权按钮操作 */
     cancelAuthUser(row) {
-      const roleId = this.queryParams.roleId;
+     const roleId = parseInt(this.queryParams.roleId);
+     // const roleId = this.queryParams.roleId;
+     // console.log("Type of roleId:", typeof roleId);
       this.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？').then(function() {
         return authUserCancel({ userId: row.userId, roleId: roleId });
       }).then(() => {
diff --git a/frontend/ruoyi-ui/src/views/system/user/index.vue b/frontend/ruoyi-ui/src/views/system/user/index.vue
index beac9d9c1eee76cab218d02a769a40d0cd30b73e..8b5a8aefb7214ec90301e922fba49ccd668811d6 100644
--- a/frontend/ruoyi-ui/src/views/system/user/index.vue
+++ b/frontend/ruoyi-ui/src/views/system/user/index.vue
@@ -576,8 +576,8 @@ export default {
         this.form = response.data;
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
-        this.form.postIds = response.postIds;
-        this.form.roleIds = response.roleIds;
+        this.$set(this.form, "postIds", response.postIds);
+        this.$set(this.form, "roleIds", response.roleIds);
         this.open = true;
         this.title = "修改用户";
         this.form.password = "";
diff --git a/go.mod b/go.mod
index fc359a4b8939b67b7d8f0073d91a7f0dfefe8416..4d5cee24f5b84686afbf3aefdfd5eef1af065e2f 100644
--- a/go.mod
+++ b/go.mod
@@ -29,6 +29,7 @@ require (
 	github.com/xuri/excelize/v2 v2.6.1
 	github.com/xxl-job/xxl-job-executor-go v0.4.0
 	golang.org/x/crypto v0.6.0
+	golang.org/x/text v0.8.0
 	gopkg.in/yaml.v2 v2.4.0
 	gorm.io/driver/mysql v1.4.1
 	gorm.io/gorm v1.24.0
@@ -87,7 +88,6 @@ require (
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/tools v0.7.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect