'commit'

dsBaseRpc/Config/ExportExcelTemplate/sysLoginperson_account_city.json

@@ -1,5 +1,5 @@
 {
-  "title": "单位管理员账号",
+  "title": "市级机构管理员账号",
   "cols": [
     {
       "col_name": "序号",

dsBaseRpc/Config/ExportExcelTemplate/sysLoginperson_account_district.json

@@ -0,0 +1,25 @@
+{
+  "title": "区县级机构管理员账号",
+  "cols": [
+    {
+      "col_name": "序号",
+      "col_field": "number",
+      "width": 15
+    },
+    {
+      "col_name": "管理员名称",
+      "col_field": "person_name",
+      "width": 40
+    },
+    {
+      "col_name": "登录名",
+      "col_field": "login_name",
+      "width": 30
+    },
+    {
+      "col_name": "初始密码",
+      "col_field": "original_pwd",
+      "width": 20
+    }
+  ]
+}

dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonService/SysLoginpersonService.go

@@ -255,8 +255,13 @@ func (s *Rpc) PageSysLoginpersonExcel(ctx context.Context, in *SysLoginpersonPro
 		LogUtil.Error(ErrorConst.SqlQueryError, "执行PageSysLoginperson时发生严重错误："+err.Error())
 		return &reply, err
 	}
-	//1、配置文件
-	jsonTemplate := "sysLoginperson_account.json"
+	//6位，我们需要取最后两位
+	//配置文件
+	jsonTemplate := "sysLoginperson_account_city.json"
+	//如果是县区，那么修改一下配置文件名称
+	if in.AreaCode[4:6]!="00" {
+		jsonTemplate = "sysLoginperson_account_district.json"
+	}
 	//2、导出
 	TargetPath := CommonUtil.GetExportExcelFilePath()
 	ExcelUtil.ExportExcel(jsonTemplate, list, TargetPath)