diff --git a/src/main/java/Tools/TestUnit/ModifyIdCardAndTel.java b/src/main/java/Tools/TestUnit/ModifyIdCardAndTel.java
index 4b94b48..e82b55c 100644
--- a/src/main/java/Tools/TestUnit/ModifyIdCardAndTel.java
+++ b/src/main/java/Tools/TestUnit/ModifyIdCardAndTel.java
@@ -50,8 +50,8 @@ public class ModifyIdCardAndTel {
                     String idcard_code=rs.get(i).getStr("idcard_code");
                     String telephone=rs.get(i).getStr("telephone");
 
-                    String aes_idcard_code= MysqlAesUtil.Encrypt(idcard_code);
-                    String aes_telephone=MysqlAesUtil.Encrypt(telephone);
+                    String aes_idcard_code= idcard_code;
+                    String aes_telephone=telephone;
 
                     batchSqlList.add("update t_sys_loginperson set idcard_code='"+aes_idcard_code+"',telephone='"+aes_telephone+"' where person_id='"+person_id+"'");
                 }
diff --git a/src/main/java/Tools/mysql/InitOrgPerson.java b/src/main/java/Tools/mysql/InitOrgPerson.java
index bd2ca26..f473696 100644
--- a/src/main/java/Tools/mysql/InitOrgPerson.java
+++ b/src/main/java/Tools/mysql/InitOrgPerson.java
@@ -100,7 +100,7 @@ public class InitOrgPerson {
         record.set("b_use", 1);
         record.set("create_time", CommonUtil.GetCurrentTimeString());
         record.set("sort_id", sort_id);
-        String idcard_code = MysqlAesUtil.Encrypt("-1");
+        String idcard_code = "-1";
         record.set("idcard_code", idcard_code);
         record.set("original_pwd", original_pwd);
         record.set("xb", 1);
diff --git a/src/main/java/Tools/mysql/clearDataBase.java b/src/main/java/Tools/mysql/clearDataBase.java
index 8a8ff0a..6473c8e 100644
--- a/src/main/java/Tools/mysql/clearDataBase.java
+++ b/src/main/java/Tools/mysql/clearDataBase.java
@@ -131,7 +131,7 @@ public class clearDataBase {
         record.set("b_use", 1);
         record.set("create_time", CommonUtil.GetCurrentTimeString());
         record.set("sort_id", sort_id);
-        String idcard_code = MysqlAesUtil.Encrypt("-1");
+        String idcard_code = "-1";
         record.set("idcard_code", idcard_code);
         record.set("original_pwd", original_pwd);
         record.set("xb", 1);
diff --git a/src/main/java/com/dsideal/FengHuang/ExcelImportTemplate/StudentImportExcelUtil.java b/src/main/java/com/dsideal/FengHuang/ExcelImportTemplate/StudentImportExcelUtil.java
index 3995a20..0db23b9 100644
--- a/src/main/java/com/dsideal/FengHuang/ExcelImportTemplate/StudentImportExcelUtil.java
+++ b/src/main/java/com/dsideal/FengHuang/ExcelImportTemplate/StudentImportExcelUtil.java
@@ -535,7 +535,7 @@ public class StudentImportExcelUtil {
             record.set("xb", rs.get(i).getStr("xb_id"));
             record.set("mz", rs.get(i).getStr("mz_id"));
             //对身份证号进行加密处理
-            String idcard_code = MysqlAesUtil.Encrypt(rs.get(i).getStr("idcard_code"));
+            String idcard_code = rs.get(i).getStr("idcard_code");
             record.set("idcard_code", idcard_code);
             //根据身份证号换算出生日期
             Map<String, String> m = IDCardUtil.getBirAgeSex(rs.get(i).getStr("idcard_code"));
@@ -829,7 +829,7 @@ public class StudentImportExcelUtil {
             record.set("mz_id", mapMz.get(mz_name));
             record.set("zzmm_id", mapZzmm.get(zzmm_name));
             record.set("idcard_code", idcard_code);
-            record.set("idcard_code_aes", MysqlAesUtil.Encrypt(idcard_code));
+            record.set("idcard_code_aes", idcard_code);
             record.set("xjh", xjh);
             record.set("xjfh", xjfh);
             record.set("source", mapSource.get(source));
diff --git a/src/main/java/com/dsideal/FengHuang/ExcelImportTemplate/TeacherImportExcelUtil.java b/src/main/java/com/dsideal/FengHuang/ExcelImportTemplate/TeacherImportExcelUtil.java
index b144fee..26470f6 100644
--- a/src/main/java/com/dsideal/FengHuang/ExcelImportTemplate/TeacherImportExcelUtil.java
+++ b/src/main/java/com/dsideal/FengHuang/ExcelImportTemplate/TeacherImportExcelUtil.java
@@ -20,23 +20,20 @@ public class TeacherImportExcelUtil {
      * 功能：检查是不是合法的xls文件
      * 作者：黄海
      * 时间：2019-01-03
+     *
      * @return
      * @throws FileNotFoundException
      */
     public static Workbook getWorkbook(FileInputStream in) throws IOException {
 
         //尝试一下是不是有效的xls文件
-        Workbook wb=null;
-        boolean isValidExcel=false;
-        try
-        {
+        Workbook wb = null;
+        boolean isValidExcel = false;
+        try {
             wb = new HSSFWorkbook(in);
-            isValidExcel=true;
-        }
-        finally
-        {
-            if(!isValidExcel && wb!=null)
-            {
+            isValidExcel = true;
+        } finally {
+            if (!isValidExcel && wb != null) {
                 wb.close();
 
                 return null;
@@ -49,43 +46,42 @@ public class TeacherImportExcelUtil {
      * 功能：检查人员的任教日期与出生年月日的关系
      * 任教：黄海
      * 时间：2019-01-10
+     *
      * @param templateXls
      * @return
      * @throws FileNotFoundException
      */
     public static JSONObject CheckTeachDate(String templateXls) throws IOException, ParseException {
-        JSONObject jo=new JSONObject();
+        JSONObject jo = new JSONObject();
         FileInputStream in = new FileInputStream(templateXls);
-        Workbook wb= getWorkbook(in);
-        Sheet sheet1= wb.getSheetAt(0);
+        Workbook wb = getWorkbook(in);
+        Sheet sheet1 = wb.getSheetAt(0);
         //声明样式
-        CellStyle redStyle=ImportExcelUtil.getCellStyle(wb, IndexedColors.RED.getIndex());
-        CellStyle whileStyle=ImportExcelUtil.getCellStyle(wb);
+        CellStyle redStyle = ImportExcelUtil.getCellStyle(wb, IndexedColors.RED.getIndex());
+        CellStyle whileStyle = ImportExcelUtil.getCellStyle(wb);
         //遍历每一个人进行检查
-        boolean success=true;
-        int count=0;
-        for (Row row : sheet1)
-        {
+        boolean success = true;
+        int count = 0;
+        for (Row row : sheet1) {
             //放过行首
-            if(count <1)
-            {
+            if (count < 1) {
                 count++;
                 continue;
             }
             //如果当前行没有数据，跳出循环: 行首第一个单元格为空，即视为当前行及以下不再为有效区域！
-            if(row.getCell(1)==null || row.getCell(1).toString().equals("")){
+            if (row.getCell(1) == null || row.getCell(1).toString().equals("")) {
                 break;
             }
             //身份证号
-            String cardNo=row.getCell(5).getStringCellValue().trim();
-            Map<String,String> m=IDCardUtil.getBirAgeSex(cardNo);
+            String cardNo = row.getCell(5).getStringCellValue().trim();
+            Map<String, String> m = IDCardUtil.getBirAgeSex(cardNo);
             //出生日期
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            String birthday=m.get("birthday");
-            Date d_birthday=sdf.parse(birthday);
+            String birthday = m.get("birthday");
+            Date d_birthday = sdf.parse(birthday);
             //从教年月日
-            String teach_date=row.getCell(10).getStringCellValue().trim().replace("/","-");
-            Date d_teach_date=sdf.parse(teach_date);
+            String teach_date = row.getCell(10).getStringCellValue().trim().replace("/", "-");
+            Date d_teach_date = sdf.parse(teach_date);
 
             //出生16年后
             Calendar c = Calendar.getInstance();
@@ -93,13 +89,10 @@ public class TeacherImportExcelUtil {
             c.add(Calendar.YEAR, 16);
             d_birthday = c.getTime();
             int i = d_teach_date.compareTo(d_birthday);
-            if(i<0)
-            {
-                success=false;
+            if (i < 0) {
+                success = false;
                 row.getCell(10).setCellStyle(redStyle);
-            }
-            else
-            {
+            } else {
                 row.getCell(10).setCellStyle(whileStyle);
             }
         }
@@ -109,24 +102,19 @@ public class TeacherImportExcelUtil {
         wb.write(excelFileOutPutStream);
         excelFileOutPutStream.flush();
 
-        if(wb!=null)
-        {
+        if (wb != null) {
             wb.close();
         }
-        if(in!=null)
-        {
+        if (in != null) {
             in.close();
         }
 
-        if(success)
-        {
-            jo.put("success",true);
-            jo.put("message","检查通过！");
-        }
-        else
-        {
-            jo.put("success",false);
-            jo.put("message","存在任教年月日在出生日期后16年之内的日期，请下载模板进行检查！");
+        if (success) {
+            jo.put("success", true);
+            jo.put("message", "检查通过！");
+        } else {
+            jo.put("success", false);
+            jo.put("message", "存在任教年月日在出生日期后16年之内的日期，请下载模板进行检查！");
         }
         return jo;
     }
@@ -135,32 +123,29 @@ public class TeacherImportExcelUtil {
      * 功能：检查是不是用于教师批量导入的模板
      * 作者：黄海
      * 时间：2019-01-03
+     *
      * @param wb
      * @return
      */
-    public static Sheet getSheetByWorkbook(Workbook wb,String templateJson)
-    {
+    public static Sheet getSheetByWorkbook(Workbook wb, String templateJson) {
         // 检查sheet表个数
         int sheetCount = wb.getNumberOfSheets();
-        String sheet1Name="教师导入模板";
-        String sheet2Name="学科隐藏Sheet";
-        if(sheetCount!=2)
-        {
+        String sheet1Name = "教师导入模板";
+        String sheet2Name = "学科隐藏Sheet";
+        if (sheetCount != 2) {
             return null;
         }
-        if(!wb.getSheetName(0).equals(sheet1Name) || !wb.getSheetName(1).equals(sheet2Name))
-        {
+        if (!wb.getSheetName(0).equals(sheet1Name) || !wb.getSheetName(1).equals(sheet2Name)) {
             return null;
         }
         //检查列数
         JSONObject jo = FileUtil.readJsonFile(templateJson);
         JSONArray colInfo = jo.getJSONArray("colInfo");
-        int needCols=colInfo.size();
+        int needCols = colInfo.size();
         //实际列数
-        Sheet sheet1=wb.getSheetAt(0);
-        int nowCols=sheet1.getRow(0).getPhysicalNumberOfCells();
-        if(needCols!=nowCols)
-        {
+        Sheet sheet1 = wb.getSheetAt(0);
+        int nowCols = sheet1.getRow(0).getPhysicalNumberOfCells();
+        if (needCols != nowCols) {
             return null;
         }
         return sheet1;
@@ -170,47 +155,41 @@ public class TeacherImportExcelUtil {
      * 功能：检查是不是有空值
      * 作者：黄海
      * 时间：2019-01-03
+     *
      * @param sheet1
      * @return
      */
-    private static JSONObject checkHaveBlankError(Sheet sheet1, CellStyle redStyle, CellStyle whileStyle)
-    {
-        JSONObject jo=new JSONObject();
-        int count=0;
-        boolean Error=false;
+    private static JSONObject checkHaveBlankError(Sheet sheet1, CellStyle redStyle, CellStyle whileStyle) {
+        JSONObject jo = new JSONObject();
+        int count = 0;
+        boolean Error = false;
         //一共多少列？
-        int nowCols=sheet1.getRow(0).getPhysicalNumberOfCells();
+        int nowCols = sheet1.getRow(0).getPhysicalNumberOfCells();
         //遍历每一行
-        for (Row row : sheet1)
-        {
+        for (Row row : sheet1) {
             count++;
             //放过行首
-            if(count <1)
-            {
+            if (count < 1) {
                 continue;
             }
 
             //如果当前行没有数据，跳出循环: 行首第一个单元格为空，即视为当前行及以下不再为有效区域！
-            if(row.getCell(1)==null || row.getCell(1).toString().equals("")){
+            if (row.getCell(1) == null || row.getCell(1).toString().equals("")) {
                 break;
             }
-            for (int i = 1; i < nowCols; i++)
-            {
+            for (int i = 1; i < nowCols; i++) {
                 Cell cell = row.getCell(i);
-                if(cell==null || cell.toString().equals(""))
-                {
+                if (cell == null || cell.toString().equals("")) {
                     cell = row.createCell(i);
                     cell.setCellStyle(redStyle);
-                    Error=true;
-                }
-                else
-                {
+                    Error = true;
+                } else {
                     cell.setCellStyle(whileStyle);
                 }
             }
         }
-        jo.put("Error",Error);
-        jo.put("count",count-2);
+        jo.put("Error", Error);
+        jo.put("count", count - 2);
         return jo;
     }
 
@@ -218,132 +197,109 @@ public class TeacherImportExcelUtil {
      * 功能：检查输入的项目是不是在合法的值域内
      * 作者：黄海
      * 时间：2019-01-03
+     *
      * @param sheet1
      * @return
      */
-    private static boolean checkValidValue(Sheet sheet1,CellStyle redStyle,CellStyle whileStyle)
-    {
-        boolean isRangeValid=true;
+    private static boolean checkValidValue(Sheet sheet1, CellStyle redStyle, CellStyle whileStyle) {
+        boolean isRangeValid = true;
         //4、检查数据的值域是不是有效
-        Map mapMz=ImportBindUtil.bindMz();         //民族
-        Map mapXl=ImportBindUtil.bindXl();         //学历
-        Map mapZzmm=ImportBindUtil.bindZzmm();     //政治面貌
-        Map mapZc=ImportBindUtil.bindZc();         //职称
-        Map mapXb=ImportBindUtil.bindXb();         //性别
-        Map mapstageSubject=ImportBindUtil.bindStageSubject();//学段学科
-        int count=0;
-        int nowCols=sheet1.getRow(0).getPhysicalNumberOfCells();
-
-        for (Row row : sheet1)
-        {
+        Map mapMz = ImportBindUtil.bindMz();         //民族
+        Map mapXl = ImportBindUtil.bindXl();         //学历
+        Map mapZzmm = ImportBindUtil.bindZzmm();     //政治面貌
+        Map mapZc = ImportBindUtil.bindZc();         //职称
+        Map mapXb = ImportBindUtil.bindXb();         //性别
+        Map mapstageSubject = ImportBindUtil.bindStageSubject();//学段学科
+        int count = 0;
+        int nowCols = sheet1.getRow(0).getPhysicalNumberOfCells();
+
+        for (Row row : sheet1) {
             //放过行首
-            if(count <1)
-            {
+            if (count < 1) {
                 count++;
                 continue;
             }
             //如果当前行没有数据，跳出循环
-            if(row.getCell(1)==null || row.getCell(1).getStringCellValue().equals("")){
+            if (row.getCell(1) == null || row.getCell(1).getStringCellValue().equals("")) {
                 break;
             }
-            String stage_name="";
-            Cell stageCell=null;
-            String subject_name="";
-            Cell subjectCell=null;
-            for (int i = 0; i < nowCols; i++)
-            {
+            String stage_name = "";
+            Cell stageCell = null;
+            String subject_name = "";
+            Cell subjectCell = null;
+            for (int i = 0; i < nowCols; i++) {
                 Cell cell = row.getCell(i);
-                switch (i)
-                {
+                switch (i) {
                     //性别
                     case 2:
-                        if(!mapXb.containsKey(getValue(cell).toString().trim()))
-                        {
-                            isRangeValid=false;
+                        if (!mapXb.containsKey(getValue(cell).toString().trim())) {
+                            isRangeValid = false;
                             cell.setCellStyle(redStyle);
-                        }
-                        else
-                        {
+                        } else {
                             cell.setCellStyle(whileStyle);
                         }
                         break;
                     //民族
                     case 3:
-                        if(!mapMz.containsKey(getValue(cell).toString().trim()))
-                        {
-                            isRangeValid=false;
+                        if (!mapMz.containsKey(getValue(cell).toString().trim())) {
+                            isRangeValid = false;
                             cell.setCellStyle(redStyle);
-                        }
-                        else
-                        {
+                        } else {
                             cell.setCellStyle(whileStyle);
                         }
                         break;
                     //政治面貌
                     case 4:
-                        if(!mapZzmm.containsKey(getValue(cell).toString().trim()))
-                        {
-                            isRangeValid=false;
+                        if (!mapZzmm.containsKey(getValue(cell).toString().trim())) {
+                            isRangeValid = false;
                             cell.setCellStyle(redStyle);
-                        }
-                        else
-                        {
+                        } else {
                             cell.setCellStyle(whileStyle);
                         }
                         break;
                     //学历
                     case 6:
-                        if(!mapXl.containsKey(getValue(cell).toString().trim()))
-                        {
-                            isRangeValid=false;
+                        if (!mapXl.containsKey(getValue(cell).toString().trim())) {
+                            isRangeValid = false;
                             cell.setCellStyle(redStyle);
-                        }
-                        else
-                        {
+                        } else {
                             cell.setCellStyle(whileStyle);
                         }
                         break;
                     //职称
                     case 7:
-                        if(!mapZc.containsKey(getValue(cell).toString().trim()))
-                        {
-                            isRangeValid=false;
+                        if (!mapZc.containsKey(getValue(cell).toString().trim())) {
+                            isRangeValid = false;
                             cell.setCellStyle(redStyle);
-                        }
-                        else
-                        {
+                        } else {
                             cell.setCellStyle(whileStyle);
                         }
                         break;
                     //学段
                     case 8:
-                        stage_name=getValue(cell).toString().trim();
-                        stageCell=cell;
+                        stage_name = getValue(cell).toString().trim();
+                        stageCell = cell;
                         break;
                     //学科
                     case 9:
-                        subject_name=getValue(cell).toString().trim();
-                        subjectCell=cell;
+                        subject_name = getValue(cell).toString().trim();
+                        subjectCell = cell;
                         break;
                     //从教年月日
                     case 10:
-                        if(!CommonUtil.isValidDate(getValue(cell).toString().trim().replace("/","-")))
-                        {
-                            isRangeValid=false;
+                        if (!CommonUtil.isValidDate(getValue(cell).toString().trim().replace("/", "-"))) {
+                            isRangeValid = false;
                             cell.setCellStyle(redStyle);
                         }
                         break;
                 }
             }
             //如果学段科目正确
-            if(!mapstageSubject.containsKey(stage_name+subject_name))
-            {
-                isRangeValid=false;
+            if (!mapstageSubject.containsKey(stage_name + subject_name)) {
+                isRangeValid = false;
                 stageCell.setCellStyle(redStyle);
                 subjectCell.setCellStyle(redStyle);
-            }
-            else
-            {
+            } else {
                 stageCell.setCellStyle(whileStyle);
                 subjectCell.setCellStyle(whileStyle);
             }
@@ -355,6 +311,7 @@ public class TeacherImportExcelUtil {
      * 功能：获取指定单元格的值
      * 作者：黄海
      * 时间：2019-01-01
+     *
      * @param cell
      * @return
      */
@@ -383,38 +340,31 @@ public class TeacherImportExcelUtil {
      * 功能：检查身份证号是不是存在问题
      * 作者：黄海
      * 时间：2019-01-03
+     *
      * @param sheet1
      * @return
      */
-    private static List<String> getNoValidCardNoList(Sheet sheet1,CellStyle redStyle,CellStyle whileStyle)
-    {
-        List<String> NoValidCardList=new ArrayList<>();
-        int count=0;
-        for (Row row : sheet1)
-        {
+    private static List<String> getNoValidCardNoList(Sheet sheet1, CellStyle redStyle, CellStyle whileStyle) {
+        List<String> NoValidCardList = new ArrayList<>();
+        int count = 0;
+        for (Row row : sheet1) {
             //放过行首
-            if(count <1)
-            {
+            if (count < 1) {
                 count++;
                 continue;
             }
             //如果当前行没有数据，跳出循环: 行首第一个单元格为空，即视为当前行及以下不再为有效区域！
-            if(row.getCell(1)==null || row.getCell(1).toString().equals("")){
+            if (row.getCell(1) == null || row.getCell(1).toString().equals("")) {
                 break;
-            }
-            else
-            {
+            } else {
                 count++;
             }
-            String cardNo=row.getCell(5).getStringCellValue().trim();
-            JSONObject jo= IDCardUtil.IDCardValidate(cardNo);
-            if(!(boolean)jo.get("success"))
-            {
+            String cardNo = row.getCell(5).getStringCellValue().trim();
+            JSONObject jo = IDCardUtil.IDCardValidate(cardNo);
+            if (!(boolean) jo.get("success")) {
                 row.getCell(5).setCellStyle(redStyle);
                 NoValidCardList.add(cardNo);
-            }
-            else
-            {
+            } else {
                 row.getCell(5).setCellStyle(whileStyle);
             }
         }
@@ -425,38 +375,31 @@ public class TeacherImportExcelUtil {
      * 功能：检查某个sheet中重复的身份证号数量
      * 作者：黄海
      * 时间：2019-01-3
+     *
      * @param sheet1
      * @return
      */
-    public static Map<String,Integer> CheckCardNoRepeatInExcel(Sheet sheet1,CellStyle  redStyle,CellStyle whileStyle)
-    {
-        Map<String,Integer> map=new HashMap<>();
-        int count=0;
-        for (Row row : sheet1)
-        {
+    public static Map<String, Integer> CheckCardNoRepeatInExcel(Sheet sheet1, CellStyle redStyle, CellStyle whileStyle) {
+        Map<String, Integer> map = new HashMap<>();
+        int count = 0;
+        for (Row row : sheet1) {
             //放过行首
-            if(count <1)
-            {
+            if (count < 1) {
                 count++;
                 continue;
             }
             //如果当前行没有数据，跳出循环: 行首第一个单元格为空，即视为当前行及以下不再为有效区域！
-            if(row.getCell(1)==null || row.getCell(1).toString().equals("")){
+            if (row.getCell(1) == null || row.getCell(1).toString().equals("")) {
                 break;
-            }
-            else
-            {
+            } else {
                 count++;
             }
-            String cardNo=row.getCell(5).getStringCellValue().trim();
-            if(map.containsKey(cardNo))
-            {
-                map.put(cardNo,map.get(cardNo)+1);
+            String cardNo = row.getCell(5).getStringCellValue().trim();
+            if (map.containsKey(cardNo)) {
+                map.put(cardNo, map.get(cardNo) + 1);
                 row.getCell(5).setCellStyle(redStyle);
-            }
-            else
-            {
-                map.put(cardNo,1);
+            } else {
+                map.put(cardNo, 1);
                 row.getCell(5).setCellStyle(whileStyle);
             }
         }
@@ -468,117 +411,108 @@ public class TeacherImportExcelUtil {
      * 功能：将本次的导入结果保存到数据库中
      * 作者：黄海
      * 时间：2019-01-04
+     *
      * @param bureau_id
      * @return
      */
-    public static JSONObject SaveBatch(String batch_id,String bureau_id,String operator,String ip_address) throws Exception {
+    public static JSONObject SaveBatch(String batch_id, String bureau_id, String operator, String ip_address) throws Exception {
         String city_id;
         String area_id;
         String main_school_id;
-        OrganizationModel orgModel=new OrganizationModel();
-        List<Record> rs=orgModel.getAreaIdByParentId(bureau_id);
-        if(rs!=null && rs.size()>0)
-        {
-            city_id=rs.get(0).getStr("city_id");
-            area_id=rs.get(0).getStr("area_id");
-            main_school_id=rs.get(0).getStr("main_school_id");
-        }
-        else
-        {
-            city_id="-1";
-            area_id="-1";
-            main_school_id="-1";
+        OrganizationModel orgModel = new OrganizationModel();
+        List<Record> rs = orgModel.getAreaIdByParentId(bureau_id);
+        if (rs != null && rs.size() > 0) {
+            city_id = rs.get(0).getStr("city_id");
+            area_id = rs.get(0).getStr("area_id");
+            main_school_id = rs.get(0).getStr("main_school_id");
+        } else {
+            city_id = "-1";
+            area_id = "-1";
+            main_school_id = "-1";
         }
 
         //2、需要按部门名称将部门ID回写
-        String sql=Db.getSql("loginPerson.needCheckOrgName");
-        List<Record> rsOrgName=Db.find(sql,batch_id);
-
-        sql=Db.getSql("organization.getFirstLevelOrgName");
-        List<Record> rsOrgHavingName=Db.find(sql,bureau_id,bureau_id);
-        Map<String,String> map=new HashMap<>();
-        for(int i=0;i<rsOrgHavingName.size();i++)
-        {
-            map.put(rsOrgHavingName.get(i).getStr("org_name"),rsOrgHavingName.get(i).getStr("org_id"));
-        }
-        List<String> list=new ArrayList<>();
-        for(int i=0;i<rsOrgName.size();i++)
-        {
-            String cName=rsOrgName.get(i).getStr("org_name");
-            if(!map.containsKey(cName))
-            {
+        String sql = Db.getSql("loginPerson.needCheckOrgName");
+        List<Record> rsOrgName = Db.find(sql, batch_id);
+
+        sql = Db.getSql("organization.getFirstLevelOrgName");
+        List<Record> rsOrgHavingName = Db.find(sql, bureau_id, bureau_id);
+        Map<String, String> map = new HashMap<>();
+        for (int i = 0; i < rsOrgHavingName.size(); i++) {
+            map.put(rsOrgHavingName.get(i).getStr("org_name"), rsOrgHavingName.get(i).getStr("org_id"));
+        }
+        List<String> list = new ArrayList<>();
+        for (int i = 0; i < rsOrgName.size(); i++) {
+            String cName = rsOrgName.get(i).getStr("org_name");
+            if (!map.containsKey(cName)) {
                 list.add(cName);
             }
         }
-        List<Record> rsImport=new ArrayList<>();
+        List<Record> rsImport = new ArrayList<>();
         //批量增加
-        for(int i=0;i<list.size();i++)
-        {
-            String nowTime= CommonUtil.GetCurrentTimeString();
-            Record record=new Record();
-            String org_id= UUID.randomUUID().toString().toUpperCase();
-            record.set("org_id",org_id);
-            record.set("org_code","-1");
-            record.set("org_name",list.get(i));
-            record.set("parent_id",bureau_id);
-            record.set("org_type_id",-1);
-            record.set("school_type_id",-1);
-            record.set("sort_id",1);
-            record.set("create_time",nowTime);
-            long org_pk_num=0;
+        for (int i = 0; i < list.size(); i++) {
+            String nowTime = CommonUtil.GetCurrentTimeString();
+            Record record = new Record();
+            String org_id = UUID.randomUUID().toString().toUpperCase();
+            record.set("org_id", org_id);
+            record.set("org_code", "-1");
+            record.set("org_name", list.get(i));
+            record.set("parent_id", bureau_id);
+            record.set("org_type_id", -1);
+            record.set("school_type_id", -1);
+            record.set("sort_id", 1);
+            record.set("create_time", nowTime);
+            long org_pk_num = 0;
             //是部门
             record.set("main_school_id", -1);
-            record.set("bureau_id",bureau_id);
-            record.set("org_pk_num",org_pk_num);
+            record.set("bureau_id", bureau_id);
+            record.set("org_pk_num", org_pk_num);
             //父节点继续过来
-            record.set("city_id",city_id);
-            record.set("area_id",area_id);
-            record.set("b_use",1);
-            record.set("is_bureau",0);
-            record.set("operator",operator);
+            record.set("city_id", city_id);
+            record.set("area_id", area_id);
+            record.set("b_use", 1);
+            record.set("is_bureau", 0);
+            record.set("operator", operator);
             record.set("ip_address", IpUtil.ipToLong(ip_address));
             rsImport.add(record);
         }
-        Db.batchSave("t_base_organization",rsImport,100);
+        Db.batchSave("t_base_organization", rsImport, 100);
         //3、没有回写成功的，而且不是空的，需要创建后回写
-        sql=Db.getSql("organization.getFirstLevelOrgName");
-        rsOrgHavingName=Db.find(sql,bureau_id,bureau_id);
-        map=new HashMap<>();
-        for(int i=0;i<rsOrgHavingName.size();i++)
-        {
-            map.put(rsOrgHavingName.get(i).getStr("org_name"),rsOrgHavingName.get(i).getStr("org_id"));
+        sql = Db.getSql("organization.getFirstLevelOrgName");
+        rsOrgHavingName = Db.find(sql, bureau_id, bureau_id);
+        map = new HashMap<>();
+        for (int i = 0; i < rsOrgHavingName.size(); i++) {
+            map.put(rsOrgHavingName.get(i).getStr("org_name"), rsOrgHavingName.get(i).getStr("org_id"));
         }
         //查找所有本次导入的部门进行回写
-        sql=Db.getSql("loginPerson.selectBatchInfoTeacher");
-        rs=Db.find(sql,batch_id);
-        List<Record> fixList=new ArrayList<>();
-        for(int i=0;i<rs.size();i++)
-        {
-            Record record=new Record();
-            int id=rs.get(i).getInt("id");
-            String org_name=rs.get(i).getStr("org_name");
-            String org_id=map.get(org_name);
-            record.set("org_id",org_id);
-            record.set("id",id);
+        sql = Db.getSql("loginPerson.selectBatchInfoTeacher");
+        rs = Db.find(sql, batch_id);
+        List<Record> fixList = new ArrayList<>();
+        for (int i = 0; i < rs.size(); i++) {
+            Record record = new Record();
+            int id = rs.get(i).getInt("id");
+            String org_name = rs.get(i).getStr("org_name");
+            String org_id = map.get(org_name);
+            record.set("org_id", org_id);
+            record.set("id", id);
             fixList.add(record);
         }
-        sql=Db.getSql("loginPerson.UpdateOrgIdByImportTeacherId");
-        Db.batch(sql,"org_id,id",fixList,100);
+        sql = Db.getSql("loginPerson.UpdateOrgIdByImportTeacherId");
+        Db.batch(sql, "org_id,id", fixList, 100);
 
         //空的写bureau_id-->org_id
-        sql=Db.getSql("loginPerson.fillOrgIdByBureauId");
-        Db.update(sql,batch_id);
+        sql = Db.getSql("loginPerson.fillOrgIdByBureauId");
+        Db.update(sql, batch_id);
 
         //4、 将导入的人员信息写入到人员表中
         //4.1 重新提交临时表数据
-        sql=Db.getSql("loginPerson.selectBatchInfoTeacher");
-        rs=Db.find(sql,batch_id);
+        sql = Db.getSql("loginPerson.selectBatchInfoTeacher");
+        rs = Db.find(sql, batch_id);
         //4.2 写入人员表
         long AllPk = PkUtil.GetPersonNumPk(5, rs.size());
-        List<Record> saveRs=new ArrayList<>();
-        for(int i=0;i<rs.size();i++)
-        {
-            long pk=AllPk-rs.size()+i+1;
+        List<Record> saveRs = new ArrayList<>();
+        for (int i = 0; i < rs.size(); i++) {
+            long pk = AllPk - rs.size() + i + 1;
             Record record = new Record();
             String loginName = "tea" + pk;
             record.set("person_id", rs.get(i).getStr("person_id"));
@@ -594,12 +528,12 @@ public class TeacherImportExcelUtil {
             record.set("mz", rs.get(i).getStr("mz_id"));
 
             //对身份证号进行加密处理
-            String idcard_code= MysqlAesUtil.Encrypt(rs.get(i).getStr("idcard_code"));
-            record.set("idcard_code",idcard_code );
+            String idcard_code = rs.get(i).getStr("idcard_code");
+            record.set("idcard_code", idcard_code);
 
             //根据身份证号换算出生日期
             record.set("org_id", rs.get(i).getStr("org_id"));
-            Map<String,String> m=IDCardUtil.getBirAgeSex( rs.get(i).getStr("idcard_code"));
+            Map<String, String> m = IDCardUtil.getBirAgeSex(rs.get(i).getStr("idcard_code"));
             record.set("birthday", m.get("birthday"));
             record.set("create_time", CommonUtil.GetCurrentTimeString());
             record.set("sort_id", 1);
@@ -608,26 +542,26 @@ public class TeacherImportExcelUtil {
             record.set("identity_pk_num", pk);
             record.set("city_id", city_id);
             record.set("area_id", area_id);
-            record.set("zzmm",rs.get(i).getStr("zzmm_id"));
+            record.set("zzmm", rs.get(i).getStr("zzmm_id"));
             record.set("main_school_id", main_school_id);
             record.set("bureau_id", bureau_id);
             record.set("t_xl_id", rs.get(i).getStr("xl_id"));
             record.set("t_stage_id", rs.get(i).getStr("stage_id"));
             record.set("t_subject_id", rs.get(i).getStr("subject_id"));
             record.set("t_zc_id", rs.get(i).getStr("zc_id"));
-            record.set("t_duty_charge","[]");
+            record.set("t_duty_charge", "[]");
             record.set("t_teaching_date", rs.get(i).getDate("teach_date"));
-            record.set("operator",operator);
+            record.set("operator", operator);
             record.set("ip_address", IpUtil.ipToLong(ip_address));
             saveRs.add(record);
         }
-        int[] result=Db.batchSave("t_sys_loginperson",saveRs,200);
+        int[] result = Db.batchSave("t_sys_loginperson", saveRs, 200);
 
         //6、回执成功
-        JSONObject jo=new JSONObject();
-        jo.put("success",true);
-        jo.put("message","导入成功！");
-        jo.put("count",result.length);
+        JSONObject jo = new JSONObject();
+        jo.put("success", true);
+        jo.put("message", "导入成功！");
+        jo.put("count", result.length);
         return jo;
     }
 
@@ -635,58 +569,49 @@ public class TeacherImportExcelUtil {
      * 功能：检查是不是合法的xls文件
      * 作者：黄海
      * 时间：2019-01-04
+     *
      * @return
      */
     public static JSONObject IsValidXls(String templateXls) throws IOException {
         //返回结果
-        JSONObject jo=new JSONObject();
+        JSONObject jo = new JSONObject();
 
         //检验文件的位置
         String basePath = PathKit.getRootClassPath() + "/WEB-INF/classes/com/dsideal/FengHuang/ExcelImportTemplate";
-        String templateJson=basePath+"/Teacher.json";
+        String templateJson = basePath + "/Teacher.json";
 
         //检查是不是EXCEL文件
         File excelFile = new File(templateXls); // 创建文件对象
-        if(!excelFile.exists())
-        {
-            jo.put("success",false);
-            jo.put("message","文件不存在！！");
+        if (!excelFile.exists()) {
+            jo.put("success", false);
+            jo.put("message", "文件不存在！！");
             return jo;
         }
-        if(!excelFile.getName().endsWith("xls"))
-        {
-            jo.put("success",false);
-            jo.put("message","只接收xls格式文件！");
+        if (!excelFile.getName().endsWith("xls")) {
+            jo.put("success", false);
+            jo.put("message", "只接收xls格式文件！");
             return jo;
         }
         FileInputStream in = new FileInputStream(excelFile); // 文件流
-        Workbook wb= getWorkbook(in);
-        if(wb==null)
-        {
-            jo.put("success",false);
-            jo.put("message","不是EXCEL文件格式！");
-        }
-        else
-        {
+        Workbook wb = getWorkbook(in);
+        if (wb == null) {
+            jo.put("success", false);
+            jo.put("message", "不是EXCEL文件格式！");
+        } else {
             //检查是不是符合我们要求的模板
-            Sheet sheet1= getSheetByWorkbook(wb,templateJson);
-            if(sheet1==null)
-            {
-                jo.put("success",false);
-                jo.put("message","不是符合要求的模板文件！");
-            }
-            else
-            {
-                jo.put("success",true);
-                jo.put("message","是符合要求的模板文件！");
+            Sheet sheet1 = getSheetByWorkbook(wb, templateJson);
+            if (sheet1 == null) {
+                jo.put("success", false);
+                jo.put("message", "不是符合要求的模板文件！");
+            } else {
+                jo.put("success", true);
+                jo.put("message", "是符合要求的模板文件！");
             }
         }
-        if(in!=null)
-        {
+        if (in != null) {
             in.close();
         }
-        if(wb!=null)
-        {
+        if (wb != null) {
             wb.close();
         }
         return jo;
@@ -696,25 +621,25 @@ public class TeacherImportExcelUtil {
      * 功能：检查xls文件是不是存在空值
      * 作者：黄海
      * 时间：2019-01-04
+     *
      * @param templateXls
      * @return
      */
-    public static JSONObject IsHaveBlank(String templateXls) throws IOException
-    {
-        JSONObject jo=new JSONObject();
+    public static JSONObject IsHaveBlank(String templateXls) throws IOException {
+        JSONObject jo = new JSONObject();
 
         FileInputStream in = new FileInputStream(templateXls); // 文件流
-        Workbook wb= getWorkbook(in);
+        Workbook wb = getWorkbook(in);
 
         //声明两个样式
-        CellStyle redStyle=ImportExcelUtil.getCellStyle(wb, IndexedColors.RED.getIndex());
-        CellStyle whileStyle=ImportExcelUtil.getCellStyle(wb);
+        CellStyle redStyle = ImportExcelUtil.getCellStyle(wb, IndexedColors.RED.getIndex());
+        CellStyle whileStyle = ImportExcelUtil.getCellStyle(wb);
 
-        Sheet sheet1= wb.getSheetAt(0);
+        Sheet sheet1 = wb.getSheetAt(0);
         //检查一下行数
 
         //检查是不是有为空的
-        JSONObject ErrorBlankJO= checkHaveBlankError(sheet1,redStyle,whileStyle);
+        JSONObject ErrorBlankJO = checkHaveBlankError(sheet1, redStyle, whileStyle);
 
         //存在不存在空的都回写一下
         FileOutputStream excelFileOutPutStream = new FileOutputStream(templateXls);
@@ -722,31 +647,23 @@ public class TeacherImportExcelUtil {
         excelFileOutPutStream.flush();
 
         //2、检查是不是都完整填写
-        if(ErrorBlankJO.getBoolean("Error"))
-        {
-            jo.put("success",false);
-            jo.put("message","发现有个人信息为空的列，不能继续，请检查后重新提交！");
-        }
-        else
-        {
-            if(ErrorBlankJO.getInteger("count")==0)
-            {
-                jo.put("success",false);
-                jo.put("message","检查发现是一个空的表格，不能上传！");
-            }
-            else
-            {
-                jo.put("success",true);
-                jo.put("message","检查通过，不存在空值的项！");
+        if (ErrorBlankJO.getBoolean("Error")) {
+            jo.put("success", false);
+            jo.put("message", "发现有个人信息为空的列，不能继续，请检查后重新提交！");
+        } else {
+            if (ErrorBlankJO.getInteger("count") == 0) {
+                jo.put("success", false);
+                jo.put("message", "检查发现是一个空的表格，不能上传！");
+            } else {
+                jo.put("success", true);
+                jo.put("message", "检查通过，不存在空值的项！");
             }
 
         }
-        if(in!=null)
-        {
+        if (in != null) {
             in.close();
         }
-        if(wb!=null)
-        {
+        if (wb != null) {
             wb.close();
         }
         return jo;
@@ -756,45 +673,41 @@ public class TeacherImportExcelUtil {
      * 功能：检查是不是存在值域不正确的数据
      * 作者：黄海
      * 时间：2019-01-04
+     *
      * @param templateXls
      * @return
      * @throws IOException
      */
-    public static JSONObject IsHaveErrorData(String templateXls) throws IOException
-    {
-        JSONObject jo=new JSONObject();
+    public static JSONObject IsHaveErrorData(String templateXls) throws IOException {
+        JSONObject jo = new JSONObject();
         // 文件流
         FileInputStream in = new FileInputStream(templateXls);
-        Workbook wb= getWorkbook(in);
+        Workbook wb = getWorkbook(in);
         //声明样式
-        CellStyle redStyle=ImportExcelUtil.getCellStyle(wb, IndexedColors.RED.getIndex());
-        CellStyle whileStyle=ImportExcelUtil.getCellStyle(wb);
+        CellStyle redStyle = ImportExcelUtil.getCellStyle(wb, IndexedColors.RED.getIndex());
+        CellStyle whileStyle = ImportExcelUtil.getCellStyle(wb);
 
         //是不是都在值域内
         boolean ErrorRange;
-        Sheet sheet1= wb.getSheetAt(0);
+        Sheet sheet1 = wb.getSheetAt(0);
 
         //检查值域是不是合法
-        ErrorRange=checkValidValue(sheet1,redStyle,whileStyle);
+        ErrorRange = checkValidValue(sheet1, redStyle, whileStyle);
         FileOutputStream excelFileOutPutStream = new FileOutputStream(templateXls);
         wb.write(excelFileOutPutStream);
         excelFileOutPutStream.flush();
 
-        if(ErrorRange)
-        {   jo.put("success",false);
-            jo.put("message","发现值域不正确的单元格，不能继续，请检查后重新提交！");
-        }
-        else
-        {
-            jo.put("success",true);
-            jo.put("message","检查通过！");
+        if (ErrorRange) {
+            jo.put("success", false);
+            jo.put("message", "发现值域不正确的单元格，不能继续，请检查后重新提交！");
+        } else {
+            jo.put("success", true);
+            jo.put("message", "检查通过！");
         }
-        if(in!=null)
-        {
+        if (in != null) {
             in.close();
         }
-        if(wb!=null)
-        {
+        if (wb != null) {
             wb.close();
         }
         return jo;
@@ -805,46 +718,39 @@ public class TeacherImportExcelUtil {
      * 功能：检查指定的文件是不是存在xls中身份证号重复
      * 作者：黄海
      * 时间：2019-01-03
+     *
      * @param templateXls
      * @return
      */
-    public static JSONObject CheckXlsCardNoDuplicate(String templateXls) throws IOException
-    {
-        JSONObject jo=new JSONObject();
+    public static JSONObject CheckXlsCardNoDuplicate(String templateXls) throws IOException {
+        JSONObject jo = new JSONObject();
         FileInputStream in = new FileInputStream(templateXls);
-        Workbook wb= getWorkbook(in);
-        Sheet sheet1= wb.getSheetAt(0);
+        Workbook wb = getWorkbook(in);
+        Sheet sheet1 = wb.getSheetAt(0);
         //声明样式
-        CellStyle redStyle=ImportExcelUtil.getCellStyle(wb, IndexedColors.RED.getIndex());
-        CellStyle whileStyle=ImportExcelUtil.getCellStyle(wb);
+        CellStyle redStyle = ImportExcelUtil.getCellStyle(wb, IndexedColors.RED.getIndex());
+        CellStyle whileStyle = ImportExcelUtil.getCellStyle(wb);
 
         //进行身份证号的检查,检查是不是合法
-        List<String> CardNoList= getNoValidCardNoList(sheet1,redStyle,whileStyle);
-        if(CardNoList!=null && CardNoList.size()>0)
-        {
-            jo.put("success",false);
-            jo.put("message","存在身份证号不合法的人员，请下载模板后检查!");
-        }
-        else
-        {
+        List<String> CardNoList = getNoValidCardNoList(sheet1, redStyle, whileStyle);
+        if (CardNoList != null && CardNoList.size() > 0) {
+            jo.put("success", false);
+            jo.put("message", "存在身份证号不合法的人员，请下载模板后检查!");
+        } else {
             //进行身份证号重复的检查
-            Map<String,Integer> map=CheckCardNoRepeatInExcel(sheet1,redStyle,whileStyle);
+            Map<String, Integer> map = CheckCardNoRepeatInExcel(sheet1, redStyle, whileStyle);
             CardNoList.clear();
-            for (Map.Entry<String, Integer> entry : map.entrySet())
-            {
-                if(entry.getValue()>1)
-                {
+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
+                if (entry.getValue() > 1) {
                     CardNoList.add(entry.getKey());
                 }
             }
-            if(CardNoList!=null && CardNoList.size()>0)
-            {
-                jo.put("success",false);
-                jo.put("message","EXCEL文件中存在身份证号重复的人员，请下载模板后检查!");
-            }
-            else{
-                jo.put("success",true);
-                jo.put("message","EXCEL文件中不存在身份证号重复的人员！");
+            if (CardNoList != null && CardNoList.size() > 0) {
+                jo.put("success", false);
+                jo.put("message", "EXCEL文件中存在身份证号重复的人员，请下载模板后检查!");
+            } else {
+                jo.put("success", true);
+                jo.put("message", "EXCEL文件中不存在身份证号重复的人员！");
             }
         }
         //检查红色
@@ -852,12 +758,10 @@ public class TeacherImportExcelUtil {
         wb.write(excelFileOutPutStream);
         excelFileOutPutStream.flush();
 
-        if(wb!=null)
-        {
+        if (wb != null) {
             wb.close();
         }
-        if(in!=null)
-        {
+        if (in != null) {
             in.close();
         }
         return jo;
@@ -867,124 +771,110 @@ public class TeacherImportExcelUtil {
      * 功能：检查指定的文件是不是存在与mysql数据库中已有人员身份证号重复的问题
      * 作者：黄海
      * 时间：2019-01-04
+     *
      * @param templateXls
      * @param bureau_id
      * @return
      * @throws IOException
      */
-    public static JSONObject CheckMysqlCardNoDuplicate(String templateXls, String bureau_id) throws Exception
-    {
+    public static JSONObject CheckMysqlCardNoDuplicate(String templateXls, String bureau_id) throws Exception {
         FileInputStream in = new FileInputStream(templateXls);
-        Workbook wb= getWorkbook(in);
-        Sheet sheet1= wb.getSheetAt(0);
+        Workbook wb = getWorkbook(in);
+        Sheet sheet1 = wb.getSheetAt(0);
         //声明样式
-        CellStyle redStyle=ImportExcelUtil.getCellStyle(wb, IndexedColors.RED.getIndex());
-        CellStyle whileStyle=ImportExcelUtil.getCellStyle(wb);
+        CellStyle redStyle = ImportExcelUtil.getCellStyle(wb, IndexedColors.RED.getIndex());
+        CellStyle whileStyle = ImportExcelUtil.getCellStyle(wb);
 
         //进行身份证号在数据库的重复的检查
-        Map mapMz=ImportBindUtil.bindMz();         //民族
-        Map mapXl=ImportBindUtil.bindXl();         //学历
-        Map mapZzmm=ImportBindUtil.bindZzmm();     //政治面貌
-        Map mapZc=ImportBindUtil.bindZc();         //职称
-        Map mapXb=ImportBindUtil.bindXb();         //性别
-        Map mapStage=ImportBindUtil.bindStage();   //学段
-
-        int count=0;
+        Map mapMz = ImportBindUtil.bindMz();         //民族
+        Map mapXl = ImportBindUtil.bindXl();         //学历
+        Map mapZzmm = ImportBindUtil.bindZzmm();     //政治面貌
+        Map mapZc = ImportBindUtil.bindZc();         //职称
+        Map mapXb = ImportBindUtil.bindXb();         //性别
+        Map mapStage = ImportBindUtil.bindStage();   //学段
+
+        int count = 0;
         //批次ID
-        String batch_id=UUID.randomUUID().toString().toUpperCase();
+        String batch_id = UUID.randomUUID().toString().toUpperCase();
 
-        List<Record> records=new ArrayList<>();
-        for (Row row : sheet1)
-        {
+        List<Record> records = new ArrayList<>();
+        for (Row row : sheet1) {
             //放过行首
-            if(count <1)
-            {
+            if (count < 1) {
                 count++;
                 continue;
             }
             //如果当前行没有数据，跳出循环: 行首第一个单元格为空，即视为当前行及以下不再为有效区域！
-            if(row.getCell(1)==null || row.getCell(1).getStringCellValue().equals("")){
+            if (row.getCell(1) == null || row.getCell(1).getStringCellValue().equals("")) {
                 break;
-            }
-            else
-            {
+            } else {
                 count++;
             }
-            String org_name=row.getCell(0).getStringCellValue().trim();
-            String person_id=UUID.randomUUID().toString().toUpperCase();
-            String person_name=row.getCell(1).getStringCellValue().trim();
-            String xb_name=row.getCell(2).getStringCellValue().trim();
-            String mz_name=row.getCell(3).getStringCellValue().trim();
-            String zzmm_name=row.getCell(4).getStringCellValue().trim();
-            String idcard_code=row.getCell(5).getStringCellValue().trim();
-            String xl_name=row.getCell(6).getStringCellValue().trim();
-            String zc_name=row.getCell(7).getStringCellValue().trim();
-            String stage_name=row.getCell(8).getStringCellValue().trim();
-            String subject_name=row.getCell(9).getStringCellValue().trim();
-            String teach_date=row.getCell(10).getStringCellValue().trim();
-            Record record=new Record();
-            record.set("batch_id",batch_id);
-            record.set("org_name",org_name);
-            record.set("person_id",person_id);
-            record.set("person_name",person_name);
-            record.set("xb_id",mapXb.get(xb_name));
-
-            if(mapMz.get(mz_name)==null)
-            {
-                for (Object key : mapMz.keySet())
-                {
+            String org_name = row.getCell(0).getStringCellValue().trim();
+            String person_id = UUID.randomUUID().toString().toUpperCase();
+            String person_name = row.getCell(1).getStringCellValue().trim();
+            String xb_name = row.getCell(2).getStringCellValue().trim();
+            String mz_name = row.getCell(3).getStringCellValue().trim();
+            String zzmm_name = row.getCell(4).getStringCellValue().trim();
+            String idcard_code = row.getCell(5).getStringCellValue().trim();
+            String xl_name = row.getCell(6).getStringCellValue().trim();
+            String zc_name = row.getCell(7).getStringCellValue().trim();
+            String stage_name = row.getCell(8).getStringCellValue().trim();
+            String subject_name = row.getCell(9).getStringCellValue().trim();
+            String teach_date = row.getCell(10).getStringCellValue().trim();
+            Record record = new Record();
+            record.set("batch_id", batch_id);
+            record.set("org_name", org_name);
+            record.set("person_id", person_id);
+            record.set("person_name", person_name);
+            record.set("xb_id", mapXb.get(xb_name));
+
+            if (mapMz.get(mz_name) == null) {
+                for (Object key : mapMz.keySet()) {
                     Object value = mapMz.get(key);
                 }
             }
-            record.set("mz_id",mapMz.get(mz_name));
-            record.set("zzmm_id",mapZzmm.get(zzmm_name));
-            record.set("idcard_code",idcard_code);
-            record.set("idcard_code_aes",MysqlAesUtil.Encrypt(idcard_code));
-            record.set("xl_id",mapXl.get(xl_name));
-            record.set("zc_id",mapZc.get(zc_name));
-            record.set("stage_id",mapStage.get(stage_name));
-            Map mapSubject=ImportBindUtil.bindSubject(Integer.parseInt(mapStage.get(stage_name).toString()));   //学段
-            record.set("subject_id",mapSubject.get(subject_name));
-            record.set("teach_date",teach_date);
-            record.set("bureau_id",bureau_id);
+            record.set("mz_id", mapMz.get(mz_name));
+            record.set("zzmm_id", mapZzmm.get(zzmm_name));
+            record.set("idcard_code", idcard_code);
+            record.set("idcard_code_aes", idcard_code);
+            record.set("xl_id", mapXl.get(xl_name));
+            record.set("zc_id", mapZc.get(zc_name));
+            record.set("stage_id", mapStage.get(stage_name));
+            Map mapSubject = ImportBindUtil.bindSubject(Integer.parseInt(mapStage.get(stage_name).toString()));   //学段
+            record.set("subject_id", mapSubject.get(subject_name));
+            record.set("teach_date", teach_date);
+            record.set("bureau_id", bureau_id);
             records.add(record);
         }
         //准备批量导入
-        Db.batchSave("t_import_teacher_by_excel",records,500);
+        Db.batchSave("t_import_teacher_by_excel", records, 500);
 
         //检查是不是存在身份证号重复的数据
-        String sql=Db.getSql("loginPerson.checkRepeatidcardByTeacherImport");
-        List<Record> rs=Db.find(sql,batch_id);
+        String sql = Db.getSql("loginPerson.checkRepeatidcardByTeacherImport");
+        List<Record> rs = Db.find(sql, batch_id);
 
         //看看哪些是重复的？
-        Map<String,String> duplicateMap=new HashMap<>();
-        for(int i=0;i<rs.size();i++)
-        {
-            duplicateMap.put(rs.get(i).getStr("idcard_code"),"1");
+        Map<String, String> duplicateMap = new HashMap<>();
+        for (int i = 0; i < rs.size(); i++) {
+            duplicateMap.put(rs.get(i).getStr("idcard_code"), "1");
         }
 
         //回写到excel中去
-        count=0;
-        for (Row row : sheet1)
-        {
+        count = 0;
+        for (Row row : sheet1) {
             //放过行首
-            if(count <1)
-            {
+            if (count < 1) {
                 count++;
                 continue;
             }
             //如果当前行没有数据，跳出循环: 行首第一个单元格为空，即视为当前行及以下不再为有效区域！
-            if(row.getCell(1)==null || row.getCell(1).toString().equals("")){
+            if (row.getCell(1) == null || row.getCell(1).toString().equals("")) {
                 break;
-            }
-            else
-            {
-                if(duplicateMap.containsKey(row.getCell(5).getStringCellValue()))
-                {
+            } else {
+                if (duplicateMap.containsKey(row.getCell(5).getStringCellValue())) {
                     row.getCell(5).setCellStyle(redStyle);
-                }
-                else
-                {
+                } else {
                     row.getCell(5).setCellStyle(whileStyle);
                 }
             }
@@ -994,25 +884,20 @@ public class TeacherImportExcelUtil {
         wb.write(excelFileOutPutStream);
         excelFileOutPutStream.flush();
 
-        JSONObject jo=new JSONObject();
-        if(rs.size()>0)
-        {
-            jo.put("success",false);
-            jo.put("message","身份证号与系统中已有人员身份证号重复！");
-        }
-        else
-        {
-            jo.put("success",true);
-            jo.put("message","身份证号与系统中已有人员身份证号无重复！");
-            jo.put("batch_id",batch_id);
+        JSONObject jo = new JSONObject();
+        if (rs.size() > 0) {
+            jo.put("success", false);
+            jo.put("message", "身份证号与系统中已有人员身份证号重复！");
+        } else {
+            jo.put("success", true);
+            jo.put("message", "身份证号与系统中已有人员身份证号无重复！");
+            jo.put("batch_id", batch_id);
         }
         //关闭workbook
-        if(wb!=null)
-        {
+        if (wb != null) {
             wb.close();
         }
-        if(in!=null)
-        {
+        if (in != null) {
             in.close();
         }
         return jo;
diff --git a/src/main/java/com/dsideal/FengHuang/LoginPerson/Model/LoginPersonModel.java b/src/main/java/com/dsideal/FengHuang/LoginPerson/Model/LoginPersonModel.java
index 8e953ec..a3ec602 100644
--- a/src/main/java/com/dsideal/FengHuang/LoginPerson/Model/LoginPersonModel.java
+++ b/src/main/java/com/dsideal/FengHuang/LoginPerson/Model/LoginPersonModel.java
@@ -137,7 +137,7 @@ public class LoginPersonModel {
         int flag = 0;
         try {
             String sql = Db.getSql("loginPerson.getIdCardIsExist");
-            List<Record> list = Db.find(sql, MysqlAesUtil.Encrypt(id_card));
+            List<Record> list = Db.find(sql, id_card);
             if (list.size() > 0) {
                 flag = 1;
             }
@@ -160,7 +160,7 @@ public class LoginPersonModel {
         int flag = 0;
         try {
             String sql = Db.getSql("loginPerson.getIdCardIsExistByPersonId");
-            List<Record> list = Db.find(sql, MysqlAesUtil.Encrypt(id_card), person_id);
+            List<Record> list = Db.find(sql, id_card, person_id);
             if (list.size() > 0) {
                 flag = 1;
             }
@@ -184,7 +184,7 @@ public class LoginPersonModel {
         try {
             String sql = Db.getSql("loginPerson.getTelephoneIsExist");
             //检查加密后的手机号是不是重复
-            String aes_telephone = MysqlAesUtil.Encrypt(telephone);
+            String aes_telephone = telephone;
             List<Record> list = Db.find(sql, aes_telephone);
             if (list.size() > 0) {
                 flag = 1;
@@ -209,7 +209,7 @@ public class LoginPersonModel {
         try {
             String sql = Db.getSql("loginPerson.getTelephoneIsExistByPersonId");
             //检查加密后的手机号是不是重复
-            String aes_telephone = MysqlAesUtil.Encrypt(telephone);
+            String aes_telephone = telephone;
             List<Record> list = Db.find(sql, aes_telephone, person_id);
             if (list.size() > 0) {
                 flag = 1;
diff --git a/src/main/java/com/dsideal/FengHuang/Student/Controller/StudentController.java b/src/main/java/com/dsideal/FengHuang/Student/Controller/StudentController.java
index 0b38153..839b9ab 100644
--- a/src/main/java/com/dsideal/FengHuang/Student/Controller/StudentController.java
+++ b/src/main/java/com/dsideal/FengHuang/Student/Controller/StudentController.java
@@ -147,7 +147,6 @@ public class StudentController extends Controller {
             String mainSchoolId = classMap.get("main_school_id").toString();
 
             //对身份证号进行加密
-            id_card= MysqlAesUtil.Encrypt(id_card);
             //操作人
             String operator=getCookie("person_id");
             //客户端ip_address
@@ -415,7 +414,6 @@ public class StudentController extends Controller {
                 }
             }
             //对身份证号进行加密
-            id_card= MysqlAesUtil.Encrypt(id_card);
             //操作人
             String operator=getCookie("person_id");
             //客户端ip_address
diff --git a/src/main/java/com/dsideal/FengHuang/Student/Model/StudentModel.java b/src/main/java/com/dsideal/FengHuang/Student/Model/StudentModel.java
index da10c45..cbdce69 100644
--- a/src/main/java/com/dsideal/FengHuang/Student/Model/StudentModel.java
+++ b/src/main/java/com/dsideal/FengHuang/Student/Model/StudentModel.java
@@ -88,11 +88,11 @@ public class StudentModel {
             record.set("person_name", person_name+"家长");
             record.set("xb", xb);
             record.set("mz", mz);
-            record.set("idcard_code",MysqlAesUtil.Encrypt("000000000000000000"));
+            record.set("idcard_code","000000000000000000");
             record.set("birthday", "1970-01-01");
             record.set("create_time", CommonUtil.GetCurrentTimeString());
             record.set("sort_id", sort_id);
-            record.set("telephone", MysqlAesUtil.Encrypt("13000000000"));
+            record.set("telephone", "13000000000");
             record.set("original_pwd", originalPwd);
             record.set("email", "11111@qq.com");
             record.set("b_use", "1");
@@ -262,7 +262,7 @@ public class StudentModel {
             if (list.size() > 0) {
                 Record record=list.get(0);
                 //显示单个人员时，需要将身份证号进行还原出来
-                record.set("idcard_code",MysqlAesUtil.Decrypt(record.getStr("idcard_code")));
+                record.set("idcard_code",record.getStr("idcard_code"));
                 return record;
             } else {
                 return null;
diff --git a/src/main/java/com/dsideal/FengHuang/Teacher/Controller/TeacherController.java b/src/main/java/com/dsideal/FengHuang/Teacher/Controller/TeacherController.java
index d52d3bf..497d276 100644
--- a/src/main/java/com/dsideal/FengHuang/Teacher/Controller/TeacherController.java
+++ b/src/main/java/com/dsideal/FengHuang/Teacher/Controller/TeacherController.java
@@ -119,7 +119,7 @@ public class TeacherController extends Controller {
             //将明文密码加密
             String pwd = CommonUtil.getLdapPassword(originalPwd);
             //对身份证号进行一次加密
-            if (!StrKit.isBlank(id_card)) id_card = MysqlAesUtil.Encrypt(id_card);
+            if (!StrKit.isBlank(id_card)) id_card =id_card;
             else id_card = "";
             //操作人
             String operator = getCookie("person_id");
@@ -405,7 +405,7 @@ public class TeacherController extends Controller {
             }
 
             //对身份证号进行一次加密
-            if(!StrKit.isBlank(id_card))id_card = MysqlAesUtil.Encrypt(id_card);
+            if(!StrKit.isBlank(id_card))id_card = id_card;
             else id_card="";
             //操作人
             String operator = getCookie("person_id");
diff --git a/src/main/java/com/dsideal/FengHuang/Teacher/Model/TeacherModel.java b/src/main/java/com/dsideal/FengHuang/Teacher/Model/TeacherModel.java
index a94ce90..2135bf6 100644
--- a/src/main/java/com/dsideal/FengHuang/Teacher/Model/TeacherModel.java
+++ b/src/main/java/com/dsideal/FengHuang/Teacher/Model/TeacherModel.java
@@ -268,7 +268,7 @@ public class TeacherModel {
         if (list.size() > 0) {
             Record record = list.get(0);
             //显示单个人员时，需要将身份证号进行还原出来
-            record.set("idcard_code", MysqlAesUtil.Decrypt(record.getStr("idcard_code")));
+            record.set("idcard_code",record.getStr("idcard_code"));
             return record;
         } else {
             return null;
diff --git a/target/classes/com.rar b/target/classes/com.rar
new file mode 100644
index 0000000..d0d22b0
Binary files /dev/null and b/target/classes/com.rar differ