From f1be0d98cc13921718a9a8fa45eae094300ad418 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Mon, 20 Jul 2020 08:41:22 +0800
Subject: [PATCH] 'commit'

---
 ....json => sysLoginperson_account_city.json} |  2 +-
 .../sysLoginperson_account_district.json      | 25 +++++++++++++++++++
 .../SysLoginpersonService.go                  |  9 +++++--
 3 files changed, 33 insertions(+), 3 deletions(-)
 rename dsBaseRpc/Config/ExportExcelTemplate/{sysLoginperson_account.json => sysLoginperson_account_city.json} (85%)
 create mode 100644 dsBaseRpc/Config/ExportExcelTemplate/sysLoginperson_account_district.json

diff --git a/dsBaseRpc/Config/ExportExcelTemplate/sysLoginperson_account.json b/dsBaseRpc/Config/ExportExcelTemplate/sysLoginperson_account_city.json
similarity index 85%
rename from dsBaseRpc/Config/ExportExcelTemplate/sysLoginperson_account.json
rename to dsBaseRpc/Config/ExportExcelTemplate/sysLoginperson_account_city.json
index 7ead0619..c47a7c1c 100644
--- a/dsBaseRpc/Config/ExportExcelTemplate/sysLoginperson_account.json
+++ b/dsBaseRpc/Config/ExportExcelTemplate/sysLoginperson_account_city.json
@@ -1,5 +1,5 @@
 {
-  "title": "单位管理员账号",
+  "title": "市级机构管理员账号",
   "cols": [
     {
       "col_name": "序号",
diff --git a/dsBaseRpc/Config/ExportExcelTemplate/sysLoginperson_account_district.json b/dsBaseRpc/Config/ExportExcelTemplate/sysLoginperson_account_district.json
new file mode 100644
index 00000000..e242b27b
--- /dev/null
+++ b/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
+    }
+  ]
+}
\ No newline at end of file
diff --git a/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonService/SysLoginpersonService.go b/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonService/SysLoginpersonService.go
index 3c599da4..baacdb3c 100644
--- a/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonService/SysLoginpersonService.go
+++ b/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)