删除用户更改逻辑

.idea/workspace.xml

@@ -2,17 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6c5cf517-721b-44b7-afae-e7b1b913b988" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/deleteUserVo.java" 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/controller/SmartGradeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.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/java/com/template/mapper/SmartUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartGrade.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartGrade.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/SystemUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/SystemUserMapper.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -27,29 +19,29 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <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="1357">
-              <caret line="2730" column="25" selection-start-line="2730" selection-start-column="25" selection-end-line="2730" selection-end-column="25" />
+            <state relative-caret-position="30">
+              <caret line="2747" column="10" lean-forward="true" selection-start-line="2747" selection-start-column="10" selection-end-line="2747" selection-end-column="10" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/deleteUserVo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="261">
-              <caret line="84" lean-forward="true" selection-start-line="84" selection-end-line="84" />
+            <state relative-caret-position="371">
+              <caret line="20" column="25" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="332">
-              <caret line="88" lean-forward="true" selection-start-line="88" selection-end-line="88" />
+            <state relative-caret-position="313">
+              <caret line="77" column="39" selection-start-line="77" selection-start-column="39" selection-end-line="77" selection-end-column="39" />
             </state>
           </provider>
         </entry>
@@ -57,8 +49,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="118">
-              <caret line="194" column="31" selection-start-line="194" selection-start-column="16" selection-end-line="194" selection-end-column="31" />
+            <state relative-caret-position="356">
+              <caret line="198" column="31" selection-start-line="198" selection-start-column="31" selection-end-line="198" selection-end-column="31" />
             </state>
           </provider>
         </entry>
@@ -66,7 +58,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="309">
+            <state relative-caret-position="654">
               <caret line="257" column="21" selection-start-line="257" selection-start-column="21" selection-end-line="257" selection-end-column="21" />
               <folding>
                 <element signature="e#6225#6226#0" expanded="true" />
@@ -78,11 +70,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="355">
-              <caret line="148" column="13" selection-start-line="148" selection-start-column="13" selection-end-line="148" selection-end-column="13" />
+            <state relative-caret-position="169">
+              <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -91,10 +83,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSubjectServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartGrade.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="560">
-              <caret line="72" column="49" selection-start-line="72" selection-start-column="30" selection-end-line="72" selection-end-column="49" />
+            <state relative-caret-position="79">
+              <caret line="65" lean-forward="true" selection-start-line="65" selection-end-line="65" />
             </state>
           </provider>
         </entry>
@@ -102,7 +94,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartClassController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-449">
+            <state relative-caret-position="-380">
               <caret line="49" column="13" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
             </state>
           </provider>
@@ -111,8 +103,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartGradeControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="146">
-              <caret line="25" column="47" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="47" />
+            <state relative-caret-position="192">
+              <caret line="27" column="37" selection-start-line="27" selection-start-column="17" selection-end-line="27" selection-end-column="37" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/updateSmartGradeRequest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="8">
+              <caret line="20" column="7" lean-forward="true" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
             </state>
           </provider>
         </entry>
@@ -154,10 +155,10 @@
       <find>allowMultiQueries</find>
       <find>updateSmartSubjectById</find>
       <find>up</find>
-      <find>updateSmartGradeById</find>
       <find>deleted</find>
       <find>分页</find>
       <find>queryAppletSubjects</find>
+      <find>updateSmartGradeById</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -167,8 +168,8 @@
       <replace>Semester</replace>
       <replace>科目</replace>
       <replace>@TableField(fill = FieldFill.INSERT)</replace>
-      <replace>updateSmartGradeById</replace>
       <replace>学期</replace>
+      <replace>updateSmartGradeById</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
@@ -214,20 +215,20 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartIdentity.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSemester.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSubjectServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SystemUserMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/daleteUserVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/deleteUserVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" />
-        <option value="$PROJECT_DIR$/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/model/pojo/SmartGrade.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
       </list>
     </option>
   </component>
@@ -260,7 +261,7 @@
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
-    <option name="width" value="974" />
+    <option name="width" value="958" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectView">
@@ -521,18 +522,18 @@
       <workItem from="1709604835831" duration="41000" />
       <workItem from="1709604890825" duration="250000" />
       <workItem from="1709606083794" duration="10623000" />
-      <workItem from="1709688259937" duration="46788000" />
+      <workItem from="1709688259937" duration="52794000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="197503000" />
+    <option name="totallyTimeSpent" value="203509000" />
   </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" weight="0.2675906" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27171493" />
       <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" />
@@ -543,8 +544,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" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4989059" weight="0.3237569" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4989059" visible="true" weight="0.40262583" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4989059" weight="0.32275712" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.4989059" visible="true" weight="0.40220994" />
       <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" />
@@ -561,7 +562,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.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.26148796" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.12739871" />
       <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" />
@@ -634,7 +635,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>2956</line>
+          <line>2979</line>
           <properties />
           <option name="timeStamp" value="91" />
         </line-breakpoint>
@@ -657,16 +658,34 @@
           <option name="timeStamp" value="111" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSemesterController.java</url>
+          <line>93</line>
+          <properties />
+          <option name="timeStamp" value="116" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java</url>
+          <line>67</line>
+          <properties />
+          <option name="timeStamp" value="117" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>2545</line>
+          <line>2637</line>
           <properties />
-          <option name="timeStamp" value="112" />
+          <option name="timeStamp" value="118" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSemesterController.java</url>
-          <line>93</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
+          <line>2753</line>
           <properties />
-          <option name="timeStamp" value="116" />
+          <option name="timeStamp" value="119" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
+          <line>2752</line>
+          <properties />
+          <option name="timeStamp" value="120" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -675,13 +694,6 @@
     <SUITE FILE_PATH="coverage/mybatis_plus$MybatisPlusApplication.ic" NAME="MybatisPlusApplication Coverage Results" MODIFIED="1709618808702" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartFaceDiscern.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-496">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartFreezeRecord.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-312">
@@ -853,13 +865,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="81" column="39" selection-start-line="81" selection-start-column="39" selection-end-line="81" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSemesterController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="102">
@@ -947,106 +952,120 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/deleteUserVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="241">
-          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="332">
-          <caret line="88" lean-forward="true" selection-start-line="88" selection-end-line="88" />
+          <caret line="88" selection-start-line="88" selection-end-line="88" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartGradeControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSubject.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
-          <caret line="25" column="47" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="47" />
+        <state relative-caret-position="34">
+          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartClassController.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="-449">
-          <caret line="49" column="13" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
+        <state relative-caret-position="261">
+          <caret line="84" selection-start-line="84" selection-end-line="84" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.11/commons-lang3-3.11.jar!/org/apache/commons/lang3/StringUtils.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="309">
-          <caret line="257" column="21" selection-start-line="257" selection-start-column="21" selection-end-line="257" selection-end-column="21" />
-          <folding>
-            <element signature="e#6225#6226#0" expanded="true" />
-            <element signature="e#6284#6285#0" expanded="true" />
-            <element signature="e#7254#7255#0" expanded="true" />
-            <element signature="e#7310#7311#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="172">
+          <caret line="1503" column="25" selection-start-line="1503" selection-start-column="25" selection-end-line="1503" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSubjectServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="118">
-          <caret line="194" column="31" selection-start-line="194" selection-start-column="16" selection-end-line="194" selection-end-column="31" />
+        <state relative-caret-position="560">
+          <caret line="72" column="49" selection-start-line="72" selection-start-column="30" selection-end-line="72" selection-end-column="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartGrade.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1357">
-          <caret line="2730" column="25" selection-start-line="2730" selection-start-column="25" selection-end-line="2730" selection-end-column="25" />
+        <state relative-caret-position="79">
+          <caret line="65" lean-forward="true" selection-start-line="65" selection-end-line="65" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSubject.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartClassController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <state relative-caret-position="-380">
+          <caret line="49" column="13" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/updateSmartGradeRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="261">
-          <caret line="84" lean-forward="true" selection-start-line="84" selection-end-line="84" />
+        <state relative-caret-position="8">
+          <caret line="20" column="7" lean-forward="true" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.11/commons-lang3-3.11.jar!/org/apache/commons/lang3/StringUtils.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartGradeControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="1503" column="25" selection-start-line="1503" selection-start-column="25" selection-end-line="1503" selection-end-column="25" />
+        <state relative-caret-position="192">
+          <caret line="27" column="37" selection-start-line="27" selection-start-column="17" selection-end-line="27" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSubjectServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/deleteUserVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="560">
-          <caret line="72" column="49" selection-start-line="72" selection-start-column="30" selection-end-line="72" selection-end-column="49" />
+        <state relative-caret-position="371">
+          <caret line="20" column="25" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartGrade.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
+        <state relative-caret-position="169">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="355">
-          <caret line="148" column="13" selection-start-line="148" selection-start-column="13" selection-end-line="148" selection-end-column="13" />
+        <state relative-caret-position="654">
+          <caret line="257" column="21" selection-start-line="257" selection-start-column="21" selection-end-line="257" selection-end-column="21" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#6225#6226#0" expanded="true" />
+            <element signature="e#6284#6285#0" expanded="true" />
+            <element signature="e#7254#7255#0" expanded="true" />
+            <element signature="e#7310#7311#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="356">
+          <caret line="198" column="31" selection-start-line="198" selection-start-column="31" selection-end-line="198" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="313">
+          <caret line="77" column="39" selection-start-line="77" selection-start-column="39" selection-end-line="77" selection-end-column="39" />
+        </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="30">
+          <caret line="2747" column="10" lean-forward="true" selection-start-line="2747" selection-start-column="10" selection-end-line="2747" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

src/main/java/com/template/api/SmartUserControllerAPI.java

@@ -73,13 +73,13 @@ public interface SmartUserControllerAPI {
     @ApiOperation(value = "导出用户数据", notes = "导出用户数据", httpMethod = "GET")
     void smartUserExport(HttpServletResponse response, Integer departmentId, String name);
 
-    @PostMapping(value = "/deleteSmartUserById")
+    @PostMapping(value = "/deleteSmartUserByIdOld")
     @ApiOperation(value = "根据ID删除指定用户", notes = "根据ID删除指定用户", httpMethod = "POST")
-    CommonResult deleteSmartUserById(@Validated @RequestBody useridsRequest ur, BindingResult bindingResult) throws Exception;
+    CommonResult deleteSmartUserByIdOld(@Validated @RequestBody useridsRequest ur, BindingResult bindingResult) throws Exception;
 
-    @PostMapping(value = "/deleteSmartUserByIdBak")
+    @PostMapping(value = "/deleteSmartUserById")
     @ApiOperation(value = "根据ID删除指定用户", notes = "根据ID删除指定用户", httpMethod = "POST")
-    CommonResult deleteSmartUserByIdBak(@Validated @RequestBody useridsRequest ur, BindingResult bindingResult) throws Exception;
+    CommonResult deleteSmartUserById(@Validated @RequestBody useridsRequest ur, BindingResult bindingResult) throws Exception;
 
     /**
      * 学生家长预约信息填写界面获取受访学生列表

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

@@ -2542,7 +2542,7 @@ public class SmartUserController implements SmartUserControllerAPI {
 
     @Override
     @DESRespondSecret(validated = true)
-    public CommonResult deleteSmartUserById(useridsRequest ur, BindingResult bindingResult) throws Exception {
+    public CommonResult deleteSmartUserByIdOld(useridsRequest ur, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -2634,7 +2634,7 @@ public class SmartUserController implements SmartUserControllerAPI {
     }
 
     @Override
-    public CommonResult deleteSmartUserByIdBak(useridsRequest ur, BindingResult bindingResult) throws Exception {
+    public CommonResult deleteSmartUserById(useridsRequest ur, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -2654,6 +2654,8 @@ public class SmartUserController implements SmartUserControllerAPI {
         List<deleteUserVo> deleteUsers = new ArrayList<>();
         SeewoClient seewoClient = new DefaultSeewoClient(new Account(seewoConfig.getAppId(), seewoConfig.getAppSecret()));
         for (SmartUser user : users) {
+            deleteUserVo deleteUser = new deleteUserVo();
+            deleteUser.setId(user.getId());
             if (user.getIdentityId().intValue() == eIdentityStatu.Parent.getValue()) {
                 List<String> studentIds = Arrays.asList(user.getAffiliate().split(","));
                 List<SmartUser> studentDatas = smartUserService.getSmartUserIds(studentIds);
@@ -2661,7 +2663,9 @@ public class SmartUserController implements SmartUserControllerAPI {
                 //region 删除原有的家长关系
                 CommonResult deleteResult = deleteOldParentShip(seewoClient, studentDatas, user.getPhone());
                 if (!deleteResult.isSuccess()) {
-                    return CommonResult.fail(deleteResult.getMessage());
+                    String reason = (deleteUser.getReason() == null ? "" : deleteUser.getReason()) + "希沃删除家长关系失败："+deleteResult.getMessage()+"；";
+                    deleteUser.setReason(reason);
+                    //return CommonResult.fail(deleteResult.getMessage());
                 }
                 //endregion
             } else if (user.getIdentityId().intValue() == eIdentityStatu.Student.getValue()) {
@@ -2671,19 +2675,25 @@ public class SmartUserController implements SmartUserControllerAPI {
                 //获取班级Uid
                 SmartClass classData = smartClassService.getSmartClassById(user.getSchoolClass());
                 if (classData == null) {
-                    return CommonResult.fail("班级数据无效，更新失败");
+                    String reason = (deleteUser.getReason() == null ? "" : deleteUser.getReason()) + "班级数据无效，百胜删除学生失败；";
+                    deleteUser.setReason(reason);
+                    //return CommonResult.fail("班级数据无效，更新失败");
                 }
                 //region 百胜删除学生
                 CommonResult deleteBsStudent = bsDeleteStudent(user);
                 if (!deleteBsStudent.isSuccess()) {
-                    return CommonResult.fail(deleteBsStudent.getMessage());
+                    String reason = (deleteUser.getReason() == null ? "" : deleteUser.getReason()) + "百胜删除学生失败；"+deleteBsStudent.getMessage()+"；";;
+                    deleteUser.setReason(reason);
+                    //return CommonResult.fail(deleteBsStudent.getMessage());
                 }
                 //endregion
 
                 //region 希沃删除学生
                 CommonResult deleteStudent = SeewoDeleteStudent(seewoClient, classData.getClassUid(), user.getCardNo());
                 if (!deleteStudent.isSuccess()) {
-                    return CommonResult.fail(deleteStudent.getMessage());
+                    String reason = (deleteUser.getReason() == null ? "" : deleteUser.getReason()) + "希沃删除学生失败；"+deleteStudent.getMessage()+"；";;
+                    deleteUser.setReason(reason);
+                    //return CommonResult.fail(deleteStudent.getMessage());
                 }
                 //endregion
 
@@ -2691,7 +2701,9 @@ public class SmartUserController implements SmartUserControllerAPI {
                     //region 删除原有的家长关系
                     CommonResult deleteResult = deleteOldStudentParentShip(seewoClient, user.getCardNo(), parents.stream().map(SmartUser::getPhone).collect(Collectors.toList()));
                     if (!deleteResult.isSuccess()) {
-                        return CommonResult.fail(deleteResult.getMessage());
+                        String reason = (deleteUser.getReason() == null ? "" : deleteUser.getReason()) + "希沃删除家长关系失败；"+deleteResult.getMessage()+"；";;
+                        deleteUser.setReason(reason);
+                        //return CommonResult.fail(deleteResult.getMessage());
                     }
                     //endregion
                 }
@@ -2700,30 +2712,41 @@ public class SmartUserController implements SmartUserControllerAPI {
                 //获取班级Uid
                 SmartClass classData = smartClassService.getSmartClassById(user.getSchoolClass());
                 if (classData == null) {
-                    return CommonResult.fail("班级数据无效，更新失败");
+                    String reason = (deleteUser.getReason() == null ? "" : deleteUser.getReason()) + "班级数据无效，百胜删除学生失败；";
+                    deleteUser.setReason(reason);
+                    //return CommonResult.fail("班级数据无效，更新失败");
                 }
 
                 //region 希沃删除教师
                 CommonResult deleteTeacher = SeewoDeleteTeacher(seewoClient, user.getPhone());
                 if (!deleteTeacher.isSuccess()) {
-                    return CommonResult.fail(deleteTeacher.getMessage());
+                    String reason = (deleteUser.getReason() == null ? "" : deleteUser.getReason()) + "百胜删除老师失败；"+deleteTeacher.getMessage()+"；";;
+                    deleteUser.setReason(reason);
+                    //return CommonResult.fail(deleteTeacher.getMessage());
                 }
                 //endregion
 
                 //region 希沃删除班主任
                 CommonResult deleteTeacherMaster = SeewoDeleteTeacherMaster(seewoClient, classData.getClassUid(), user.getPhone());
                 if (deleteTeacherMaster.isSuccess()) {
-                    return CommonResult.fail(deleteTeacherMaster.getMessage());
+                    String reason = (deleteUser.getReason() == null ? "" : deleteUser.getReason()) + "希沃删除班主任失败；"+deleteTeacherMaster.getMessage()+"；";;
+                    deleteUser.setReason(reason);
+                    //return CommonResult.fail(deleteTeacherMaster.getMessage());
                 }
                 //endregion
 
                 //region 百胜删除教师
                 CommonResult bsDeleteTeacher = bsDeleteTeacher(user.getBsStaffCode());
                 if (!bsDeleteTeacher.isSuccess()) {
-                    return CommonResult.fail(bsDeleteTeacher.getMessage());
+                    String reason = (deleteUser.getReason() == null ? "" : deleteUser.getReason()) + "百胜删除老师失败；"+bsDeleteTeacher.getMessage()+"；";;
+                    deleteUser.setReason(reason);
+                    //return CommonResult.fail(bsDeleteTeacher.getMessage());
                 }
                 //endregion
             }
+            if(deleteUser.getReason() != null){
+                deleteUsers.add(deleteUser);
+            }
 
         }
 

src/main/resources/mapper/template/SmartUserMapper.xml

@@ -196,7 +196,7 @@
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update smart_user
             <set>
-                delete_reason=${item.reason}
+                delete_reason=#{item.reason}
             </set>
             where id = ${item.id}
         </foreach>

target/classes/mapper/template/SmartUserMapper.xml

@@ -196,7 +196,7 @@
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update smart_user
             <set>
-                delete_reason=${item.reason}
+                delete_reason=#{item.reason}
             </set>
             where id = ${item.id}
         </foreach>