'commit'

WebRoot/html/pages/accountManagement/AreaManager.html

@@ -77,6 +77,7 @@
                 ,cols: [[
                     // {type: 'checkbox', fixed: 'left',align:'center'}
                     {field:'', title:'序号',align:'center',type:'numbers',width:80,fixed:true}
+                    ,{field:'city_name', title:'市/州',align:'center'}
                     ,{field:'person_name', title:'用户名',align:'center'}
                     ,{field:'login_name', title:'登录名',align:'center'}
                     ,{field:'original_pwd', title:'初始密码',align:'center'}

src/main/java/com/dsideal/base/Menu/Model/MenuModel.java

@@ -105,6 +105,7 @@ public class MenuModel {
         //查询人员的所在单位、身份信息
         String sql = "select bureau_id,identity_id from t_sys_loginperson where  person_id=?";
         Record record = Db.findFirst(sql, person_id);
+        if (record == null || record.getStr("bureau_id") == null) return ManagerConst.NOT_MANAGER;
         String org_id = record.getStr("bureau_id");
         int identity_id = record.getInt("identity_id");
         if (identity_id != 4) return ManagerConst.NOT_MANAGER;//非单位管理员

src/main/java/com/dsideal/base/Tools/InitOrgPerson.java

@@ -74,7 +74,7 @@ public class InitOrgPerson {
         generateUser(1, "系统管理员", "110000", "110101", 1, adminId, "00000000");
         //遍历所有云南省的市
         String province_id = "FD61813E-70A1-42AB-9A8E-141ED4D47B98";
-        sql = "select * from t_dm_area where province_id=? and LEVEL_id=4";
+        sql = "select * from t_dm_area where province_id=? and LEVEL_id=4 order by sort_id,area_code";
         List<Record> cityList = Db.find(sql, province_id);
         for (Record city : cityList) {
             String city_id = city.getStr("id");
@@ -82,7 +82,7 @@ public class InitOrgPerson {
             generateUser(2, city_name+"管理员", city_id, "", 2, city_id, city_id);
             System.out.println("正在生成:" + city_name + "的管理员账号！");
             //遍历所有市下的县
-            sql = "select * from t_dm_area where parent_id=?";
+            sql = "select * from t_dm_area where parent_id=? order by sort_id,area_code";
             List<Record> countyList = Db.find(sql, city_id);
             for (Record county : countyList) {
                 String county_id = county.getStr("id");

src/main/resources/ExcelExportTemplate/getPrintAreaManager.json

@@ -5,6 +5,11 @@
   "rowHeight": 30,
   "showNumber": true,
   "colInfo": [
+    {
+      "show_column_name": "城市",
+      "list_column_name": "city_name",
+      "width": 40
+    },
     {
       "show_column_name": "姓名",
       "list_column_name": "person_name",

src/main/resources/Sql/loginPerson.sql

@@ -144,7 +144,7 @@ select person_id,person_name,identity_id,login_name,pwd,original_pwd,xb,zzmm,mz,
   -- 市管理员
   #sql("getPrintCityManager")
     select person_id,person_name,login_name,original_pwd,pwd from t_sys_loginperson
-    where identity_id =2 order by sort_id
+    where identity_id =2 order by sort_id,login_name
   #end
 
   -- 市直属单位
@@ -155,7 +155,10 @@ select person_id,person_name,identity_id,login_name,pwd,original_pwd,xb,zzmm,mz,
 
   -- 县区管理员
   #sql("getPrintAreaManager")
-    select person_id,person_name,login_name,original_pwd,pwd from t_sys_loginperson where identity_id =3 order by sort_id
+    select t1.person_id,t1.person_name,t1.login_name,t1.original_pwd,t1.pwd,t2.area_name as city_name
+       from t_sys_loginperson as t1
+        inner join t_dm_area as t2 on t1.city_id=t2.id
+        where t1.identity_id =3 order by t1.sort_id,t2.area_name
   #end
 
   -- 指定县区的单位