教师批量导入

.idea/workspace.xml

@@ -2,22 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="981dbcd1-a700-4015-8567-2ccff8e76f0a" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/DingTalkInterface.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/HttpClientDingUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/config/DingConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/HttpClientUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/HttpClientUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/RequestUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/RequestUtils.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/ScheduleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-dev.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-prod.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
@@ -33,43 +20,43 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="66">
+              <caret line="743" column="54" selection-start-line="743" selection-start-column="54" selection-end-line="743" selection-end-column="54" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="186">
-              <caret line="733" column="9" lean-forward="true" selection-start-line="733" selection-start-column="9" selection-end-line="733" selection-end-column="9" />
+            <state relative-caret-position="166">
+              <caret line="4014" column="35" selection-start-line="4014" selection-start-column="35" selection-end-line="4014" selection-end-column="35" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#3255#3979#0" />
                 <element signature="e#3985#4857#0" />
-                <element signature="e#27846#28672#0" />
-                <element signature="e#28678#30996#0" />
-                <element signature="e#53199#57402#1" />
-                <element signature="e#69004#73207#1" />
-                <element signature="e#100532#100536#0" />
-                <element signature="e#100640#100709#1" />
-                <element signature="e#136901#136916#0" />
-                <element signature="e#138746#138762#0" />
-                <element signature="e#143014#143035#0" />
-                <element signature="e#143014#148665#0" />
-                <element signature="e#148687#148709#0" />
-                <element signature="e#148687#151512#0" />
-                <element signature="e#151534#151554#0" />
-                <element signature="e#154558#154583#0" />
-                <element signature="e#208041#208060#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="556">
-              <caret line="101" column="36" selection-start-line="101" selection-start-column="17" selection-end-line="101" selection-end-column="36" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="-388">
+              <caret line="78" selection-start-line="78" selection-end-line="78" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="355">
+              <caret line="100" column="31" selection-start-line="100" selection-start-column="31" selection-end-line="100" selection-end-column="31" />
             </state>
           </provider>
         </entry>
@@ -85,8 +72,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>getInputStream()</find>
-      <find>dummyData</find>
       <find>result</find>
       <find>out</find>
       <find>请假</find>
@@ -107,7 +92,6 @@
       <find>bsEUpdateStudent</find>
       <find>setUserTimeGroup</find>
       <find>setIs</find>
-      <find>importExcelUsers</find>
       <find>insertSmartUser</find>
       <find>headImage</find>
       <find>photoList</find>
@@ -115,6 +99,9 @@
       <find>smartDepartmentService.list</find>
       <find>classDatas</find>
       <find>isEmpty</find>
+      <find>已存在</find>
+      <find>studentDatas</find>
+      <find>importExcelUsers</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -129,7 +116,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartTimeGroupService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartAuthorGroupControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorGroupController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartDepartmentService.java" />
@@ -169,7 +155,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/DingTalkUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/HttpClientUtils.java" />
@@ -179,6 +164,8 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/RequestUtils.java" />
         <option value="$PROJECT_DIR$/wanzai/src/main/java/com/template/controller/SmartUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
       </list>
     </option>
@@ -211,9 +198,9 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="953" />
-    <option name="width" value="974" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="-7" />
+    <option name="width" value="958" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectView">
@@ -271,15 +258,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
-              <item name="backend_code" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="config" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -382,7 +360,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../智慧宿舍可视化大屏/SmartDormitoryBackEnd" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../民宿/mhotel" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
@@ -483,18 +461,18 @@
       <workItem from="1714292233330" duration="18000" />
       <workItem from="1714370355699" duration="3428000" />
       <workItem from="1714985190382" duration="4553000" />
-      <workItem from="1715062890965" duration="28142000" />
+      <workItem from="1715062890965" duration="34350000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="205157000" />
+    <option name="totallyTimeSpent" value="211365000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="-7" y="0" width="958" height="1039" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.11353944" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.35634744" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -505,8 +483,8 @@
       <window_info id="Web" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32932165" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.46389496" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.726477" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.46298343" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.33038673" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -523,7 +501,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.24945295" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.8731343" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.8062361" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" />
@@ -616,12 +594,6 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>4014</line>
-          <properties />
-          <option name="timeStamp" value="133" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
           <line>3905</line>
           <properties />
           <option name="timeStamp" value="137" />
@@ -699,16 +671,22 @@
           <option name="timeStamp" value="180" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java</url>
-          <line>754</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
+          <line>4700</line>
           <properties />
-          <option name="timeStamp" value="182" />
+          <option name="timeStamp" value="193" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>4700</line>
+          <line>306</line>
           <properties />
-          <option name="timeStamp" value="193" />
+          <option name="timeStamp" value="198" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
+          <line>1657</line>
+          <properties />
+          <option name="timeStamp" value="202" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -718,20 +696,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eQrcodeType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="23" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartVisitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="267">
-          <caret line="66" column="17" selection-start-line="66" selection-start-column="17" selection-end-line="66" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScore.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="175">
@@ -855,17 +819,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="13">
-          <caret line="246" column="36" selection-start-line="246" selection-start-column="36" selection-end-line="246" selection-end-column="36" />
-          <folding>
-            <element signature="e#11874#11875#0" expanded="true" />
-            <element signature="e#11917#11918#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartAttendanceServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="887">
@@ -1099,29 +1052,35 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="355">
+          <caret line="100" column="31" selection-start-line="100" selection-start-column="31" selection-end-line="100" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-388">
+          <caret line="78" selection-start-line="78" selection-end-line="78" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="743" column="54" selection-start-line="743" selection-start-column="54" selection-end-line="743" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="733" column="9" lean-forward="true" selection-start-line="733" selection-start-column="9" selection-end-line="733" selection-end-column="9" />
+        <state relative-caret-position="166">
+          <caret line="4014" column="35" selection-start-line="4014" selection-start-column="35" selection-end-line="4014" selection-end-column="35" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#3255#3979#0" />
             <element signature="e#3985#4857#0" />
-            <element signature="e#27846#28672#0" />
-            <element signature="e#28678#30996#0" />
-            <element signature="e#53199#57402#1" />
-            <element signature="e#69004#73207#1" />
-            <element signature="e#100532#100536#0" />
-            <element signature="e#100640#100709#1" />
-            <element signature="e#136901#136916#0" />
-            <element signature="e#138746#138762#0" />
-            <element signature="e#143014#143035#0" />
-            <element signature="e#143014#148665#0" />
-            <element signature="e#148687#148709#0" />
-            <element signature="e#148687#151512#0" />
-            <element signature="e#151534#151554#0" />
-            <element signature="e#154558#154583#0" />
-            <element signature="e#208041#208060#0" />
           </folding>
         </state>
       </provider>

src/main/java/com/template/common/utils/TimeExchange.java

@@ -18,6 +18,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.regex.Pattern;
 
 /**
  * 时间转化工具 date转为时间戳 时间戳转date 互相与String的转换
@@ -749,10 +750,15 @@ public class TimeExchange {
         return new SimpleDateFormat("EEEE").format(c.getTime());
     }
 
+    public static boolean vertify(String pwd){
+        //密码至少包含：大小写英文字母、数字,密码长度大于8位,小于20位
+        String regex = "^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z]).{8,20}$";
+        return Pattern.matches(regex, pwd);
+    }
+
     public static void main(String[] args) {
-        int bzValue = 1 / 2;
-        String sdsd ="";
-        System.out.println(bzValue);
+        boolean result = vertify("Stc.123456");
+        System.out.println(result);
 
     }
 

src/main/java/com/template/controller/SmartSubjectController.java

@@ -4,6 +4,7 @@ package com.template.controller;
 import com.template.annotation.DESRespondSecret;
 import com.template.api.SmartSubjectControllerAPI;
 import com.template.common.utils.paramUtils;
+import com.template.model.pojo.SmartIdentity;
 import com.template.model.pojo.SmartSubject;
 import com.template.model.pojo.SmartSubject;
 import com.template.model.result.CommonResult;
@@ -46,6 +47,11 @@ public class SmartSubjectController implements SmartSubjectControllerAPI {
             return CommonResult.fail(st);
         }
 
+        SmartSubject  data = smartSubjectService.querySubjectByName(smartApply.getName());
+        if (data != null) {
+            return CommonResult.fail("该科目已存在");
+        }
+
         int result = smartSubjectService.insertSmartSubject(smartApply);
 
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
@@ -66,6 +72,19 @@ public class SmartSubjectController implements SmartSubjectControllerAPI {
             return CommonResult.fail(st);
         }
 
+        SmartSubject oldData = smartSubjectService.getSmartById(sa.getId());
+        if (oldData == null) {
+            return CommonResult.fail("科目数据无效，修改失败");
+        }
+
+        if (sa.getName() != null && !sa.getName().equals(oldData.getName())) {
+            //查看是否存在相同身份的数据
+            SmartSubject data = smartSubjectService.querySubjectByName(sa.getName());
+            if (data != null) {
+                return CommonResult.fail("该科目已存在");
+            }
+        }
+
         int result = smartSubjectService.updateSmartSubject(sa);
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }

src/main/java/com/template/controller/SmartUserController.java

@@ -1609,7 +1609,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                                 return CommonResult.fail("导入数据第九列为民族");
                             }
                             String card = dataFormatter.formatCellValue(row.getCell(9));//身份证
-                            if (!card.equals("身份证(允许为空)")) {
+                            if (!card.equals("身份证(允许为空）")) {
                                 return CommonResult.fail("导入数据第十列为身份证");
                             }
                             String photo = dataFormatter.formatCellValue(row.getCell(10));//照片
@@ -1655,7 +1655,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                             user.setDepartmentId(oDepartment.get().getId());
 
                             if (departmentName.equals("班主任")) {
-                                String schoolClass = dataFormatter.formatCellValue(row.getCell(6));//班级
+                                String schoolClass = dataFormatter.formatCellValue(row.getCell(7));//班级
                                 if (ObjectUtils.isEmpty(schoolClass)) {
                                     return CommonResult.fail(name + "的管理班级不能为空");
                                 }
@@ -2060,7 +2060,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                                 return CommonResult.fail("导入数据第九列为民族");
                             }
                             String card = dataFormatter.formatCellValue(row.getCell(9));//身份证
-                            if (!card.equals("身份证(允许为空)")) {
+                            if (!card.equals("身份证(允许为空）")) {
                                 return CommonResult.fail("导入数据第十列为身份证");
                             }
                             String photo = dataFormatter.formatCellValue(row.getCell(10));//照片
@@ -2106,7 +2106,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                             user.setDepartmentId(oDepartment.get().getId());
 
                             if (departmentName.equals("班主任")) {
-                                String schoolClass = dataFormatter.formatCellValue(row.getCell(6));//班级
+                                String schoolClass = dataFormatter.formatCellValue(row.getCell(7));//班级
                                 if (ObjectUtils.isEmpty(schoolClass)) {
                                     return CommonResult.fail(name + "的管理班级不能为空");
                                 }