feat: 合并代码

src/modules/system/controller/sys_user.go

@@ -400,10 +400,11 @@ func (s *SysUserController) Export(c *gin.Context) {
 		"E1": "手机号码",
 		"F1": "用户性别",
 		"G1": "帐号状态",
-		"H1": "最后登录IP",
-		"I1": "最后登录时间",
-		"J1": "部门名称",
-		"K1": "部门负责人",
+		"H1": "部门编号",
+		"I1": "部门名称",
+		"J1": "部门负责人",
+		"K1": "最后登录IP",
+		"L1": "最后登录时间",
 	}
 	// 读取用户性别字典数据
 	dictSysUserSex := s.sysDictDataService.SelectDictDataByType("sys_user_sex")
@@ -432,10 +433,11 @@ func (s *SysUserController) Export(c *gin.Context) {
 			"E" + idx: row.PhoneNumber,
 			"F" + idx: sysUserSex,
 			"G" + idx: statusValue,
-			"H" + idx: row.LoginIP,
-			"I" + idx: date.ParseDateToStr(row.LoginDate, date.YYYY_MM_DD_HH_MM_SS),
-			"J" + idx: row.Dept.DeptName,
-			"K" + idx: row.Dept.Leader,
+			"H" + idx: row.Dept.DeptID,
+			"I" + idx: row.Dept.DeptName,
+			"J" + idx: row.Dept.Leader,
+			"K" + idx: row.LoginIP,
+			"L" + idx: date.ParseDateToStr(row.LoginDate, date.YYYY_MM_DD_HH_MM_SS),
 		})
 	}
 
@@ -455,7 +457,23 @@ func (s *SysUserController) Export(c *gin.Context) {
 func (s *SysUserController) Template(c *gin.Context) {
 	fileName := fmt.Sprintf("user_import_template_%d.xlsx", time.Now().UnixMilli())
 	asserPath := "assets/template/excel/user_import_template.xlsx"
-	c.FileAttachment(asserPath, fileName)
+
+	// 从 embed.FS 中读取默认配置文件内容
+	assetsDir := config.GetAssetsDirFS()
+
+	// 读取内嵌文件
+	fileData, err := assetsDir.ReadFile(asserPath)
+	if err != nil {
+		c.String(500, "Failed to read file")
+		return
+	}
+
+	// 设置响应头
+	c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=%s", fileName))
+	c.Header("Content-Type", "application/octet-stream")
+
+	// 返回响应体
+	c.Data(200, "application/octet-stream", fileData)
 }
 
 // 用户信息列表导入