From cf25cda454a645ea47ce6135184c3df6afd09ddc Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期六, 20 一月 2024 10:40:41 +0800
Subject: [PATCH] 2024-01-20 朱宝民 删除不存在用户提示信息,用户名字段改名,Long型字段转字符串

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java |   28 +++-------------------------
 1 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
index d61e5f6..5a85dee 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
@@ -83,27 +83,6 @@
                     //璁剧疆鏁版嵁婧�
                     DataSourceContext.set(orgTag);
                     if(!this.existDistricts()){
-                        if(configXml.existElement(doc, "config.orgs.org" + num + ".districts.province")){
-                            String distriName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province","name", null, false, null) ;
-                            String distriNum = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province","num", null, false, null) ;
-                            Integer distriLevel = configXml.getSetAttrPlusInt(doc, "config.orgs.org" + num + ".districts.province","level", null, 0, 99,null) ;
-                            Long supperId = this.saveDistrict(null, distriName, distriNum, distriLevel);
-                            if(supperId != null && configXml.existElement(doc, "config.orgs.org" + num + ".districts.province.city")){
-                                if(configXml.existElement(doc, "config.orgs.org" + num + ".districts.province.city")){
-                                    distriName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city","name", null, false, null) ;
-                                    distriNum = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city","num", null, false, null) ;
-                                    distriLevel = configXml.getSetAttrPlusInt(doc, "config.orgs.org" + num + ".districts.province.city","level", null, 1, 99,null) ;
-                                    supperId = this.saveDistrict(supperId, distriName, distriNum, distriLevel);
-                                    if(supperId != null && configXml.existElement(doc, "config.orgs.org" + num + ".districts.province.city.country")){
-                                        distriName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city.country","name", null, false, null) ;
-                                        distriNum = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city.country","num", null, false, null) ;
-                                        distriLevel = configXml.getSetAttrPlusInt(doc, "config.orgs.org" + num + ".districts.province.city.country","level", null, 1, 99,null) ;
-                                        this.saveDistrict(supperId, distriName, distriNum, distriLevel);
-                                    }
-                                }
-                            }
-                        }
-                        /* 2023-11-23 涓嬮潰鏄渶鍒濆疄鐜帮紝鍚庢弧瓒矷C鍗′腑瀛樺湪鐪佺殑瑕佹眰锛屽鍔犵渷绾ц鏀垮尯鍒�
                         if(configXml.existElement(doc, "config.orgs.org" + num + ".districts.city")){
                             String distriName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.city","name", null, false, null) ;
                             String distriNum = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.city","num", null, false, null) ;
@@ -116,7 +95,6 @@
                                 this.saveDistrict(supperId, distriName, distriNum, distriLevel);
                             }
                         }
-                        */
                     }
                     if(!this.existUsers()){
                         if(configXml.existElement(doc, "config.orgs.org" + num + ".user")){
@@ -170,7 +148,7 @@
             po.num = num ;
             po.level = DistrictLevel.get(level.byteValue()) ;
             po.deleted = Deleted.NO ;
-            this.distriDao.insert(po) ;
+            this.distriDao.putin(po) ;
             return po.getId() ;
         }else{
             return null ;
@@ -191,14 +169,14 @@
                 (password != null && !password.trim().equals("")) &&
                 supperAdmin != null){
             BaUser po = new BaUser() ;
-            po.name = name ;
+            po.userName = name ;
             po.phone = phone ;
             po.password = MD5.encrypt(password) ;//杩涜鍔犲瘑鐮� ;
             po.orgTag = orgTag ;
             po.supperAdmin = supperAdmin.byteValue() ;
             po.disabled = Disabled.NO ;
             po.deleted = Deleted.NO ;
-            this.userDao.insert(po) ;
+            this.userDao.putin(po) ;
         }
     }
 

--
Gitblit v1.8.0