sdsd

.idea/workspace.xml

@@ -2,7 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="981dbcd1-a700-4015-8567-2ccff8e76f0a" name="Default Changelist" comment="">
+      <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/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/model/pojo/SmartAuthority.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartAuthority.java" 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/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -18,76 +21,34 @@
   <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/api/SmartUserControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="578">
-              <caret line="227" column="36" selection-start-line="227" selection-start-column="27" selection-end-line="227" selection-end-column="36" />
+            <state relative-caret-position="-450">
+              <caret line="320" column="29" selection-start-line="320" selection-start-column="29" selection-end-line="320" selection-end-column="29" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-96">
+              <caret line="293" column="63" selection-start-line="293" selection-start-column="51" selection-end-line="293" selection-end-column="63" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <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="923">
-              <caret line="5157" column="4" selection-start-line="5157" selection-start-column="4" selection-end-line="5157" selection-end-column="4" />
+            <state relative-caret-position="332">
+              <caret line="4258" column="132" selection-start-line="4258" selection-start-column="11" selection-end-line="4258" selection-end-column="132" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#3400#3420#0" />
-                <element signature="e#3400#3646#0" />
-                <element signature="e#3400#4894#0" />
-                <element signature="e#4900#6770#0" />
-                <element signature="e#6776#11135#0" />
-                <element signature="e#11141#11967#0" />
-                <element signature="e#11973#14291#0" />
-                <element signature="e#14297#18386#0" />
-                <element signature="e#18408#18421#0" />
-                <element signature="e#19010#19030#0" />
-                <element signature="e#19010#19907#0" />
-                <element signature="e#19853#19868#0" />
-                <element signature="e#19873#19890#0" />
-                <element signature="e#19878#43965#0" />
-                <element signature="e#43987#44010#0" />
-                <element signature="e#44015#70228#0" />
-                <element signature="e#70250#70272#0" />
-                <element signature="e#70277#96489#0" />
-                <element signature="e#43928#43943#0" />
-                <element signature="e#43949#43966#0" />
-                <element signature="e#48839#48857#0" />
-                <element signature="e#54201#54220#0" />
-                <element signature="e#112294#112310#0" />
-                <element signature="e#112294#116925#0" />
-                <element signature="e#116947#116960#0" />
-                <element signature="e#116965#126172#0" />
-                <element signature="e#126194#126207#0" />
-                <element signature="e#126212#149398#0" />
-                <element signature="e#149420#149437#0" />
-                <element signature="e#149443#149460#0" />
-                <element signature="e#149443#151477#0" />
-                <element signature="e#150455#150474#0" />
-                <element signature="e#152621#152638#0" />
-                <element signature="e#155067#155084#0" />
-                <element signature="e#156954#156969#0" />
-                <element signature="e#158955#158972#0" />
-                <element signature="e#161682#161701#0" />
-                <element signature="e#163999#164014#0" />
-                <element signature="e#166680#166695#0" />
-                <element signature="e#168511#168527#0" />
-                <element signature="e#170564#170580#0" />
-                <element signature="e#172751#172772#0" />
-                <element signature="e#178410#178432#0" />
-                <element signature="e#181243#181263#0" />
-                <element signature="e#184223#184240#0" />
-                <element signature="e#184246#184271#0" />
-                <element signature="e#186717#186745#0" />
-                <element signature="e#189046#189063#0" />
-                <element signature="e#191413#191428#0" />
-                <element signature="e#194188#194203#0" />
-                <element signature="e#195731#195746#0" />
-                <element signature="e#198393#198408#0" />
-                <element signature="e#201095#201109#0" />
-                <element signature="e#203850#203865#0" />
-                <element signature="e#203870#209811#0" />
                 <element signature="e#209833#209846#0" />
                 <element signature="e#209851#209982#0" />
                 <element signature="e#220159#220180#0" />
@@ -99,10 +60,6 @@
                 <element signature="e#226286#226307#0" />
                 <element signature="e#226286#233694#0" />
                 <element signature="e#233716#234627#0" />
-                <element signature="e#235481#235500#0" />
-                <element signature="e#235481#236698#0" />
-                <element signature="e#236720#236741#0" />
-                <element signature="e#236720#240178#0" />
                 <element signature="e#240203#240216#0" />
                 <element signature="e#240203#244847#0" />
                 <element signature="e#244869#244890#0" />
@@ -118,50 +75,55 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+        <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="107">
+              <caret line="107" column="30" selection-start-line="107" selection-start-column="26" selection-end-line="107" selection-end-column="50" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/DingtalkController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="112" column="65" selection-start-line="112" selection-start-column="65" selection-end-line="112" selection-end-column="65" />
+            <state relative-caret-position="1675">
+              <caret line="122" lean-forward="true" selection-start-line="122" selection-end-line="122" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartNotificationController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataTaskServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="317">
-              <caret line="36" column="31" selection-start-line="36" selection-start-column="12" selection-end-line="36" selection-end-column="31" />
+            <state relative-caret-position="633">
+              <caret line="679" column="35" selection-start-line="679" selection-start-column="8" selection-end-line="679" selection-end-column="35" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDepartment.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartAuthority.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="543">
-              <caret line="42" column="23" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="23" />
+            <state relative-caret-position="116">
+              <caret line="70" column="40" selection-start-line="70" selection-start-column="40" selection-end-line="70" selection-end-column="40" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherServiceBatchSaveOrUpdateTeacherParam.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="318">
-              <caret line="120" column="37" selection-start-line="120" selection-start-column="37" selection-end-line="120" selection-end-column="37" />
-              <folding>
-                <element signature="e#3137#3138#0" expanded="true" />
-                <element signature="e#3185#3186#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="361">
+              <caret line="62" column="78" selection-start-line="62" selection-start-column="78" selection-end-line="62" selection-end-column="78" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="273">
-              <caret line="785" column="28" selection-start-line="785" selection-start-column="28" selection-end-line="785" selection-end-column="28" />
+            <state relative-caret-position="269">
+              <caret line="46" column="35" selection-start-line="46" selection-start-column="16" selection-end-line="46" selection-end-column="35" />
             </state>
           </provider>
         </entry>
@@ -177,13 +139,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>/ 100</find>
-      <find>导入</find>
-      <find>import</find>
-      <find>importExcel</find>
-      <find>(int) Math.ceil((double)</find>
-      <find>teachers</find>
-      <find>departmentId</find>
       <find>readXlsx</find>
       <find>teacherDatas</find>
       <find>isEmp</find>
@@ -207,6 +162,13 @@
       <find>queryUserData</find>
       <find>queryClassUser</find>
       <find>eGroupTime</find>
+      <find>getAuthorByKey</find>
+      <find>querySmartUserPages</find>
+      <find>new PageUtils</find>
+      <find>result</find>
+      <find>queryPageSmartUser</find>
+      <find>希沃班牌</find>
+      <find>queryDepartmentTree</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -222,13 +184,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartVisitorServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/DingTalkUtil.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/HttpClientDingUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/DingTalkInterface.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.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/resources/log4j2.yml" />
@@ -272,7 +232,9 @@
         <option value="$PROJECT_DIR$/src/test/java/com/template/MybatisPlusApplicationTests.java" />
         <option value="$PROJECT_DIR$/src/test/java/com/template/WrapperTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartAuthority.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
       </list>
     </option>
   </component>
@@ -304,8 +266,8 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="953" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
@@ -382,7 +344,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
-              <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="services" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -392,16 +354,14 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="services" type="462c0819:PsiDirectoryNode" />
+              <item name="impl" 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="services" type="462c0819:PsiDirectoryNode" />
-              <item name="impl" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -409,6 +369,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="template" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -428,7 +389,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$/../../校车预约移动端/carBooksDevelopV" />
     <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" />
@@ -530,12 +491,12 @@
       <workItem from="1714292233330" duration="18000" />
       <workItem from="1714370355699" duration="3428000" />
       <workItem from="1714985190382" duration="4553000" />
-      <workItem from="1715062890965" duration="54988000" />
+      <workItem from="1715062890965" duration="63089000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="232003000" />
+    <option name="totallyTimeSpent" value="240104000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -547,10 +508,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.17963752" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.41794312" />
       <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" />
@@ -562,7 +523,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32932165" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.45623633" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.43535912" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.5359116" />
       <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" weight="0.32932165" />
@@ -579,7 +540,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.5957684" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.6181619" />
       <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" />
@@ -666,30 +627,24 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>3950</line>
+          <line>3952</line>
           <properties />
           <option name="timeStamp" value="137" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>3564</line>
+          <line>3566</line>
           <properties />
           <option name="timeStamp" value="159" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>3761</line>
+          <line>3763</line>
           <properties />
           <option name="timeStamp" value="173" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java</url>
-          <line>299</line>
-          <properties />
-          <option name="timeStamp" value="176" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java</url>
           <line>458</line>
           <properties />
           <option name="timeStamp" value="177" />
@@ -706,6 +661,12 @@
           <properties />
           <option name="timeStamp" value="180" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java</url>
+          <line>253</line>
+          <properties />
+          <option name="timeStamp" value="222" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -714,62 +675,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="80" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/WxUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="126" column="12" selection-start-line="126" selection-start-column="12" selection-end-line="126" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/HttpsClient.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="391" column="12" selection-start-line="391" selection-start-column="12" selection-end-line="391" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/Task.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="711" column="16" selection-start-line="711" selection-start-column="16" selection-end-line="711" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/DBUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="27" column="4" selection-start-line="27" selection-start-column="4" selection-end-line="27" selection-end-column="73" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/AesTestOne.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="43" column="77" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="77" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/AesUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="26" column="4" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="75" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/ExcelUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="21" column="4" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="77" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/DateUtils.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="230">
@@ -840,16 +745,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="714">
-          <caret line="60" column="56" lean-forward="true" selection-start-line="60" selection-start-column="56" selection-end-line="60" selection-end-column="56" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LogInfoController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="161">
@@ -913,13 +808,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WxGzhController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="43">
-          <caret line="42" column="40" selection-start-line="42" selection-start-column="40" selection-end-line="42" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="93">
@@ -1030,13 +918,6 @@
         </state>
       </provider>
     </entry>
-    <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="269">
-          <caret line="92" column="42" selection-start-line="92" selection-start-column="27" selection-end-line="92" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherServiceBatchSaveOrUpdateTeacherParam.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="318">
@@ -1055,81 +936,76 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/DingtalkController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WxGzhController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="112" column="65" selection-start-line="112" selection-start-column="65" selection-end-line="112" selection-end-column="65" />
+        <state relative-caret-position="43">
+          <caret line="42" column="40" selection-start-line="42" selection-start-column="40" selection-end-line="42" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SystemMenuController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartAuthorityServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="592">
+          <caret line="67" column="69" selection-start-line="67" selection-start-column="59" selection-end-line="67" selection-end-column="69" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/RepairAdmin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="585">
+          <caret line="79" column="4" selection-start-line="79" selection-start-column="4" selection-end-line="81" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="116">
+          <caret line="70" column="40" selection-start-line="70" selection-start-column="40" selection-end-line="70" selection-end-column="40" />
+        </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="269">
+          <caret line="46" column="35" selection-start-line="46" selection-start-column="16" selection-end-line="46" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <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="578">
-          <caret line="227" column="36" selection-start-line="227" selection-start-column="27" selection-end-line="227" selection-end-column="36" />
+        <state relative-caret-position="361">
+          <caret line="62" column="78" selection-start-line="62" selection-start-column="78" selection-end-line="62" selection-end-column="78" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDataTaskServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="633">
+          <caret line="679" column="35" selection-start-line="679" selection-start-column="8" selection-end-line="679" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-450">
+          <caret line="320" column="29" selection-start-line="320" selection-start-column="29" selection-end-line="320" selection-end-column="29" />
         </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="923">
-          <caret line="5157" column="4" selection-start-line="5157" selection-start-column="4" selection-end-line="5157" selection-end-column="4" />
+        <state relative-caret-position="332">
+          <caret line="4258" column="132" selection-start-line="4258" selection-start-column="11" selection-end-line="4258" selection-end-column="132" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#3400#3420#0" />
-            <element signature="e#3400#3646#0" />
-            <element signature="e#3400#4894#0" />
-            <element signature="e#4900#6770#0" />
-            <element signature="e#6776#11135#0" />
-            <element signature="e#11141#11967#0" />
-            <element signature="e#11973#14291#0" />
-            <element signature="e#14297#18386#0" />
-            <element signature="e#18408#18421#0" />
-            <element signature="e#19010#19030#0" />
-            <element signature="e#19010#19907#0" />
-            <element signature="e#19853#19868#0" />
-            <element signature="e#19873#19890#0" />
-            <element signature="e#19878#43965#0" />
-            <element signature="e#43987#44010#0" />
-            <element signature="e#44015#70228#0" />
-            <element signature="e#70250#70272#0" />
-            <element signature="e#70277#96489#0" />
-            <element signature="e#43928#43943#0" />
-            <element signature="e#43949#43966#0" />
-            <element signature="e#48839#48857#0" />
-            <element signature="e#54201#54220#0" />
-            <element signature="e#112294#112310#0" />
-            <element signature="e#112294#116925#0" />
-            <element signature="e#116947#116960#0" />
-            <element signature="e#116965#126172#0" />
-            <element signature="e#126194#126207#0" />
-            <element signature="e#126212#149398#0" />
-            <element signature="e#149420#149437#0" />
-            <element signature="e#149443#149460#0" />
-            <element signature="e#149443#151477#0" />
-            <element signature="e#150455#150474#0" />
-            <element signature="e#152621#152638#0" />
-            <element signature="e#155067#155084#0" />
-            <element signature="e#156954#156969#0" />
-            <element signature="e#158955#158972#0" />
-            <element signature="e#161682#161701#0" />
-            <element signature="e#163999#164014#0" />
-            <element signature="e#166680#166695#0" />
-            <element signature="e#168511#168527#0" />
-            <element signature="e#170564#170580#0" />
-            <element signature="e#172751#172772#0" />
-            <element signature="e#178410#178432#0" />
-            <element signature="e#181243#181263#0" />
-            <element signature="e#184223#184240#0" />
-            <element signature="e#184246#184271#0" />
-            <element signature="e#186717#186745#0" />
-            <element signature="e#189046#189063#0" />
-            <element signature="e#191413#191428#0" />
-            <element signature="e#194188#194203#0" />
-            <element signature="e#195731#195746#0" />
-            <element signature="e#198393#198408#0" />
-            <element signature="e#201095#201109#0" />
-            <element signature="e#203850#203865#0" />
-            <element signature="e#203870#209811#0" />
             <element signature="e#209833#209846#0" />
             <element signature="e#209851#209982#0" />
             <element signature="e#220159#220180#0" />
@@ -1141,10 +1017,6 @@
             <element signature="e#226286#226307#0" />
             <element signature="e#226286#233694#0" />
             <element signature="e#233716#234627#0" />
-            <element signature="e#235481#235500#0" />
-            <element signature="e#235481#236698#0" />
-            <element signature="e#236720#236741#0" />
-            <element signature="e#236720#240178#0" />
             <element signature="e#240203#240216#0" />
             <element signature="e#240203#244847#0" />
             <element signature="e#244869#244890#0" />
@@ -1158,6 +1030,37 @@
         </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="107">
+          <caret line="107" column="30" selection-start-line="107" selection-start-column="26" selection-end-line="107" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/DingtalkController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1675">
+          <caret line="122" lean-forward="true" selection-start-line="122" selection-end-line="122" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eApproveStatu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-96">
+          <caret line="293" column="63" selection-start-line="293" selection-start-column="51" selection-end-line="293" selection-end-column="63" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

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

@@ -105,6 +105,9 @@ public interface SmartUserControllerAPI {
     @ApiOperation(value = "用户分页数据", notes = "用户分页数据", httpMethod = "GET")
     CommonResult queryPageSmartUser(@RequestParam int currentPage, @RequestParam int pageCount, Integer departmentId, String name, @RequestHeader("user_head") String userhead);
 
+    @GetMapping(value = "/queryPageSmartUserNoAuth")
+    @ApiOperation(value = "用户分页数据", notes = "用户分页数据", httpMethod = "GET")
+    CommonResult queryPageSmartUserNoAuth(@RequestParam int currentPage, @RequestParam int pageCount, Integer departmentId, String name, @RequestHeader("user_head") String userhead);
 
     @GetMapping(value = "/testDeleteUserById")
     @ApiOperation(value = "测试删除用户", notes = "测试删除用户", httpMethod = "POST")
@@ -213,6 +216,8 @@ public interface SmartUserControllerAPI {
     CommonResult queryUserDeletePage(@RequestParam int currentPage, @RequestParam int pageCount);
 
 
+
+
     /**
      * 获取班级下的学生
      */

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

@@ -4,7 +4,9 @@ package com.template.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.qcloud.cos.utils.IOUtils;
@@ -4111,6 +4113,7 @@ public class SmartUserController implements SmartUserControllerAPI {
     //endregion
 
     //region 用户分页数据
+
     /**
      * 用户分页数据查询
      *
@@ -4177,7 +4180,108 @@ public class SmartUserController implements SmartUserControllerAPI {
             }
         }
 
-        PageUtils<UserVo> result = smartUserService.querySmartUserPages(currentPage, pageCount, authDepartments, name);
+        PageUtils<UserVo> result = null;
+        if (authDepartments != null && authDepartments.size() > 0) {
+            result = smartUserService.querySmartUserPages(currentPage, pageCount, authDepartments, name);
+        } else {
+            IPage<UserVo> userData = new Page<>();
+            result = new PageUtils<UserVo>(userData);
+        }
+
+        if (result != null && result.getList() != null) {
+            List<Integer> studentIds = new ArrayList<>();
+            List<String> studentStrs = Arrays.asList(StringUtils.join(result.getList().stream().map(UserVo::getAffiliate).collect(Collectors.toList()), ",").split(","));
+            for (String studentStr : studentStrs) {
+                if (!ObjectUtils.isEmpty(studentStr)) {
+                    studentIds.add(Integer.valueOf(studentStr));
+                }
+            }
+            List<SmartUser> students = studentIds != null && studentIds.size() > 0 ? smartUserService.getSmartUserByIds(studentIds) : new ArrayList<>();
+            List<SmartClass> classs = smartClassService.list(null);
+
+            List<SmartIdentity> idnetitys = smartIdentityService.list(null);
+
+            for (UserVo data : result.getList()) {
+                data.setTimeGroupName(eGroupTime(data.getTimeGroupId()));
+
+                Optional<SmartIdentity> identityData = idnetitys.stream().filter(e -> e.getId().equals(data.getIdentityId())).findFirst();
+                if (identityData != null && identityData.isPresent()) {
+                    data.setIdentity(identityData.get().getName());
+                }
+
+                data.setSex(eSexStatu.stringOf(data.getSexId()));
+                Optional<SmartDepartment> departmentData = departments == null ? null : departments.stream().filter(e -> e.getId().equals(data.getDepartmentId())).findFirst();
+                if (departmentData != null && departmentData.isPresent()) {
+                    data.setDepartment(departmentData.get().getName());
+                }
+                Optional<SmartClass> nowClass = classs == null ? null : classs.stream().filter(e -> e.getId().equals(data.getSchoolClass())).findFirst();
+                if (nowClass != null && nowClass.isPresent()) {
+                    data.setClassStr(nowClass.get().getName());
+                }
+
+                List<AffiliateUserVo> datas = new ArrayList<>();
+                if (data.getAffiliate() != null) {
+                    List<String> affiliates = Arrays.asList(data.getAffiliate().split(","));
+                    for (String a : affiliates) {
+                        if (!ObjectUtils.isEmpty(a)) {
+                            Optional<SmartUser> student = students.stream().filter(e -> e.getId().equals(Integer.valueOf(a))).findFirst();
+                            if (student != null && student.isPresent()) {
+                                AffiliateUserVo affiliate = new AffiliateUserVo();
+                                affiliate.setId(student.get().getId());
+                                affiliate.setName(student.get().getName());
+                                affiliate.setCardNo(student.get().getCardNo());
+                                affiliate.setDepartmentId(student.get().getDepartmentId());
+                                datas.add(affiliate);
+                            }
+                        }
+                    }
+                }
+                data.setAffiliates(datas);
+            }
+        }
+
+        return CommonResult.ok(result);
+    }
+    //endregion
+
+    //region 用户分页数据
+
+    /**
+     * 用户分页数据查询
+     *
+     * @param currentPage  当前页数
+     * @param pageCount    一页数据条数
+     * @param departmentId 部门ID
+     * @return
+     */
+    @Override
+    @DESRespondSecret(validated = true)
+    public CommonResult queryPageSmartUserNoAuth(int currentPage, int pageCount, Integer departmentId, String name, String userhead) {
+        //region 角色判断
+        String userID = AesUtils.decrypt(userhead);
+        SmartUser operateData = smartUserService.getSmartById(Integer.valueOf(userID));
+        if (operateData == null) {
+            return CommonResult.fail("用户信息不合法，无法查看");
+        }
+        //endregion
+
+        //获取该部门下的所有子级部门ID
+        List<Integer> childDepartmentIds = new ArrayList<>();
+        List<SmartDepartment> departments = smartDepartmentService.list(null);
+        childDepartmentIds.add(departmentId);
+        QueryDepartmentTreeRecords(departmentId, departments, childDepartmentIds);
+
+        if (departmentId == null) {
+            childDepartmentIds = null;
+        }
+
+        PageUtils<UserVo> result = null;
+        if (childDepartmentIds != null && childDepartmentIds.size() > 0) {
+            result = smartUserService.querySmartUserPages(currentPage, pageCount, childDepartmentIds, name);
+        } else {
+            IPage<UserVo> userData = new Page<>();
+            result = new PageUtils<UserVo>(userData);
+        }
 
         if (result != null && result.getList() != null) {
             List<Integer> studentIds = new ArrayList<>();
@@ -4236,12 +4340,14 @@ public class SmartUserController implements SmartUserControllerAPI {
     //endregion
 
     //region 用户导出
+
     /**
      * 用户导出
-     * @param response 响应头
+     *
+     * @param response     响应头
      * @param departmentId 部门ID
-     * @param name 名称
-     * @param userhead 请求头
+     * @param name         名称
+     * @param userhead     请求头
      */
     @Override
     @DESRespondSecret(validated = false)
@@ -4419,6 +4525,7 @@ public class SmartUserController implements SmartUserControllerAPI {
     //endregion
 
     //region 根据父级ID获取树形数据
+
     /**
      * 根据父级ID获取树形数据
      *
@@ -4441,6 +4548,7 @@ public class SmartUserController implements SmartUserControllerAPI {
     //endregion
 
     //region 根据父级ID往上查找父级数据
+
     /**
      * 根据父级ID获取父级数据
      *
@@ -5156,6 +5264,7 @@ public class SmartUserController implements SmartUserControllerAPI {
     //endregion
 
     //region 根据年级查询毕业年份
+
     /**
      * 根据年级查询毕业年份
      *

src/main/java/com/template/model/pojo/SmartAuthority.java

@@ -66,6 +66,9 @@ public class SmartAuthority implements Serializable {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateUser;
 
+    @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
     private Integer deleted;