溪鸭夏 2 år sedan
förälder
incheckning
a20b1dd22e

+ 35 - 50
.idea/workspace.xml

@@ -2,8 +2,8 @@
 <project version="4">
 <project version="4">
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="981dbcd1-a700-4015-8567-2ccff8e76f0a" name="Default Changelist" comment="">
     <list default="true" id="981dbcd1-a700-4015-8567-2ccff8e76f0a" name="Default Changelist" comment="">
-      <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$/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" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartAuthorGroupControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartAuthorGroupControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorGroupController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorGroupController.java" afterDir="false" />
     </list>
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -20,37 +20,19 @@
   <component name="FileEditorManager">
   <component name="FileEditorManager">
     <leaf>
     <leaf>
       <file pinned="false" current-in-tab="true">
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/StudentServiceBatchSaveClassStudentsParam.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorGroupController.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1436">
-              <caret line="274" column="38" selection-start-line="274" selection-start-column="38" selection-end-line="274" selection-end-column="38" />
+            <state relative-caret-position="497">
+              <caret line="617" column="47" lean-forward="true" selection-start-line="617" selection-start-column="47" selection-end-line="617" selection-end-column="47" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartTimeGroupService.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartAuthorGroupControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="529">
-              <caret line="28" column="49" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="49" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartTimeGroupServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="562">
-              <caret line="63" column="55" selection-start-line="63" selection-start-column="11" selection-end-line="63" selection-end-column="55" />
-            </state>
-          </provider>
-        </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="192">
-              <caret line="98" column="27" selection-start-line="98" selection-start-column="17" selection-end-line="98" selection-end-column="27" />
+            <state relative-caret-position="440">
+              <caret line="65" column="112" lean-forward="true" selection-start-line="65" selection-start-column="97" selection-end-line="65" selection-end-column="112" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -59,7 +41,6 @@
   </component>
   </component>
   <component name="FindInProjectRecents">
   <component name="FindInProjectRecents">
     <findStrings>
     <findStrings>
-      <find>queryAllDepartmentTree</find>
       <find>百胜新增</find>
       <find>百胜新增</find>
       <find>student_startdate</find>
       <find>student_startdate</find>
       <find>百胜</find>
       <find>百胜</find>
@@ -89,6 +70,7 @@
       <find>importExcelUsers</find>
       <find>importExcelUsers</find>
       <find>删除</find>
       <find>删除</find>
       <find>希沃</find>
       <find>希沃</find>
+      <find>queryUserAuthor</find>
     </findStrings>
     </findStrings>
     <replaceStrings>
     <replaceStrings>
       <replace />
       <replace />
@@ -116,6 +98,8 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartTimeGroupServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartTimeGroupServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartTimeGroupService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartTimeGroupService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.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" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -147,9 +131,9 @@
   <component name="MavenRunner">
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
     <option name="skipTests" value="true" />
   </component>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
     <option name="x" value="-7" />
-    <option name="width" value="958" />
+    <option name="width" value="974" />
     <option name="height" value="1039" />
     <option name="height" value="1039" />
   </component>
   </component>
   <component name="ProjectView">
   <component name="ProjectView">
@@ -341,15 +325,16 @@
       <option name="number" value="Default" />
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1712903307839</updated>
       <updated>1712903307839</updated>
-      <workItem from="1712903309092" duration="29439000" />
+      <workItem from="1712903309092" duration="29634000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="29439000" />
+    <option name="totallyTimeSpent" value="29634000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <editor active="true" />
     <layout>
     <layout>
       <window_info id="JRebel" side_tool="true" />
       <window_info id="JRebel" side_tool="true" />
       <window_info id="Image Layers" />
       <window_info id="Image Layers" />
@@ -358,11 +343,11 @@
       <window_info id="Favorites" side_tool="true" />
       <window_info id="Favorites" side_tool="true" />
       <window_info id="Designer" />
       <window_info id="Designer" />
       <window_info id="Web" side_tool="true" />
       <window_info id="Web" side_tool="true" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14978679" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.30703625" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Spring" weight="0.32932165" />
       <window_info anchor="bottom" id="Spring" weight="0.32932165" />
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
-      <window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.32932165" />
+      <window_info anchor="bottom" id="Terminal" weight="0.32932165" />
       <window_info anchor="bottom" id="Docker" weight="0.32932165" />
       <window_info anchor="bottom" id="Docker" weight="0.32932165" />
       <window_info anchor="bottom" id="Messages" weight="0.32928178" />
       <window_info anchor="bottom" id="Messages" weight="0.32928178" />
       <window_info anchor="bottom" id="Java Enterprise" weight="0.32932165" />
       <window_info anchor="bottom" id="Java Enterprise" weight="0.32932165" />
@@ -372,7 +357,7 @@
       <window_info anchor="bottom" id="JRebel Console" side_tool="true" />
       <window_info anchor="bottom" id="JRebel Console" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32932165" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32932165" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.45076588" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.45524862" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.8402626" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.8402626" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <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="Inspection" order="5" weight="0.4" />
@@ -448,20 +433,6 @@
     </breakpoint-manager>
     </breakpoint-manager>
   </component>
   </component>
   <component name="editorHistoryManager">
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsDeleteStudentVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsDepartmentNoVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsControlVo.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsControlVo.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="253">
         <state relative-caret-position="253">
@@ -806,8 +777,22 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/StudentServiceBatchSaveClassStudentsParam.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/StudentServiceBatchSaveClassStudentsParam.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1436">
-          <caret line="274" column="38" selection-start-line="274" selection-start-column="38" selection-end-line="274" selection-end-column="38" />
+        <state relative-caret-position="171">
+          <caret line="197" column="11" lean-forward="true" selection-start-line="197" selection-start-column="11" selection-end-line="197" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartAuthorGroupControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="65" column="112" lean-forward="true" selection-start-line="65" selection-start-column="97" selection-end-line="65" selection-end-column="112" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorGroupController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="497">
+          <caret line="617" column="47" lean-forward="true" selection-start-line="617" selection-start-column="47" selection-end-line="617" selection-end-column="47" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>

+ 1 - 1
src/main/java/com/template/api/SmartAuthorGroupControllerAPI.java

@@ -63,7 +63,7 @@ public interface SmartAuthorGroupControllerAPI {
 
 
     @RequestMapping(value = "/queryUserAuthor")
     @RequestMapping(value = "/queryUserAuthor")
     @ApiOperation(value = "查看用户个人权限", notes = "编辑权限组数据", httpMethod = "POST")
     @ApiOperation(value = "查看用户个人权限", notes = "编辑权限组数据", httpMethod = "POST")
-    public CommonResult queryUserAuthor(@RequestParam String userId,@RequestParam String userHead);
+    public CommonResult queryUserAuthor(@RequestParam String userId, @RequestHeader("user_head") String userhead);
 
 
     @RequestMapping(value = "/querySmartAuthorGroup")
     @RequestMapping(value = "/querySmartAuthorGroup")
     @ApiOperation(value = "权限组分页数据", notes = "权限组分页数据", httpMethod = "GET")
     @ApiOperation(value = "权限组分页数据", notes = "权限组分页数据", httpMethod = "GET")

+ 2 - 2
src/main/java/com/template/controller/SmartAuthorGroupController.java

@@ -614,9 +614,9 @@ public class SmartAuthorGroupController implements SmartAuthorGroupControllerAPI
     @PassToken
     @PassToken
     @Override
     @Override
     @DESRespondSecret(validated = false)
     @DESRespondSecret(validated = false)
-    public CommonResult queryUserAuthor(String userId,String userHead) {
+    public CommonResult queryUserAuthor(String userId,String userhead) {
         if (userId==null || userId.equals("")){
         if (userId==null || userId.equals("")){
-            userId = AesUtils.decrypt(userHead);
+            userId = AesUtils.decrypt(userhead);
         }
         }
         String[] userids = userId.split(",");
         String[] userids = userId.split(",");
         QueryWrapper<SmartAuthority> queryWrapper1 = new QueryWrapper<>();
         QueryWrapper<SmartAuthority> queryWrapper1 = new QueryWrapper<>();

BIN
target/mybatis_plus-0.0.1-SNAPSHOT.jar.original