bug

.idea/workspace.xml

@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="a4ba97bd-69fc-4549-8407-13eeec316f0f" name="Default Changelist" comment="" />
+    <list default="true" id="a4ba97bd-69fc-4549-8407-13eeec316f0f" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/alumni.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/alumni.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/alumni.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/alumni.jar.original" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/AlumniClubController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/AlumniClubController.class" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -28,47 +34,95 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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/AlumniCategoryImageController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="585">
-              <caret line="109" column="52" selection-start-line="109" selection-start-column="52" selection-end-line="109" selection-end-column="52" />
+            <state relative-caret-position="332">
+              <caret line="98" column="54" selection-start-line="98" selection-start-column="54" selection-end-line="98" selection-end-column="54" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniActivityController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="15422">
+              <caret line="844" column="27" selection-start-line="844" selection-start-column="27" selection-end-line="844" selection-end-column="27" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniCategoryNewsController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="2116">
+              <caret line="112" column="29" selection-start-line="112" selection-start-column="25" selection-end-line="112" selection-end-column="29" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/ActivityReportController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="345">
+              <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/AlumniCategoryImage.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/ActivityImageController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="55" column="40" selection-start-line="55" selection-start-column="40" selection-end-line="55" selection-end-column="40" />
+            <state relative-caret-position="322">
+              <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniImageController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="183">
-              <caret line="54" column="25" lean-forward="true" selection-start-line="54" selection-start-column="25" selection-end-line="54" selection-end-column="25" />
+            <state relative-caret-position="269">
+              <caret line="67" column="23" selection-start-line="67" selection-start-column="19" selection-end-line="67" selection-end-column="23" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/ImagePageVo.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniAdminApplyController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="295">
+              <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniUserController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="281">
-              <caret line="51" column="7" lean-forward="true" selection-start-line="51" selection-start-column="7" selection-end-line="51" selection-end-column="7" />
+            <state relative-caret-position="518">
+              <caret line="264" column="79" selection-start-line="264" selection-start-column="79" selection-end-line="264" selection-end-column="79" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniCategoryController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="383">
-              <caret line="116" column="9" selection-start-line="106" selection-start-column="8" selection-end-line="116" selection-end-column="9" />
+            <state relative-caret-position="499">
+              <caret line="594" column="92" lean-forward="true" selection-start-line="591" selection-start-column="16" selection-end-line="594" selection-end-column="92" />
+              <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/FileController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="287">
+              <caret line="49" column="49" selection-start-line="49" selection-start-column="49" selection-end-line="49" selection-end-column="49" />
             </state>
           </provider>
         </entry>
@@ -84,13 +138,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>queryActivityPages</find>
-      <find>articivityIds</find>
-      <find>activityDetailByActivityIds</find>
-      <find>getAlumniActivityExcel</find>
-      <find>queryActivityApplyPages</find>
-      <find>insertActivity</find>
-      <find>dataRow.createCell</find>
       <find>queryClubProcessExcel</find>
       <find>queryClubExcelApplys</find>
       <find>queryClubApplys</find>
@@ -114,6 +161,13 @@
       <find>imageApplyPageDatas</find>
       <find>queryImageApplyPage</find>
       <find>queryImagePage</find>
+      <find>setIsJoin</find>
+      <find>queryClubByCategoryId</find>
+      <find>微校通知</find>
+      <find>queryMobileUserPages</find>
+      <find>》</find>
+      <find>queryIinitiatedApply</find>
+      <find>null</find>
     </findStrings>
     <replaceStrings>
       <replace>FIND_IN_SET($</replace>
@@ -152,7 +206,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/FileControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/FileController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniUserMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniEndorseController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniEndorseMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/template/ActivityReportMapper.xml" />
@@ -165,7 +218,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/updateClubRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/HomeClubVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ClubListDataVO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/AlumniActivityControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniClubMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/aop/LoggingAspect.java" />
@@ -176,6 +228,8 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniCategoryImageController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/AlumniCategoryImage.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniImageController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniUserController.java" />
       </list>
     </option>
   </component>
@@ -415,12 +469,12 @@
       <workItem from="1734339752050" duration="415000" />
       <workItem from="1734340563706" duration="19557000" />
       <workItem from="1734482972516" duration="8300000" />
-      <workItem from="1734503337021" duration="19254000" />
+      <workItem from="1734503337021" duration="26636000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="92609000" />
+    <option name="totallyTimeSpent" value="99991000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -432,10 +486,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="974" height="1039" extended-state="1" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.3380744" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18710022" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="JRebel" order="2" side_tool="true" />
       <window_info id="Image Layers" order="3" />
@@ -446,8 +500,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" weight="0.35027623" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5756906" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.35359117" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.5624309" />
       <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" />
@@ -464,7 +518,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.797593" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.9671773" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="JRebel Setup Guide" order="5" side_tool="true" weight="0.32932165" />
       <window_info anchor="right" id="Capture Analysis" order="6" />
@@ -506,9 +560,9 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubController.java</url>
-          <line>143</line>
+          <line>326</line>
           <properties />
-          <option name="timeStamp" value="16" />
+          <option name="timeStamp" value="19" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -518,32 +572,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/AlumniEndorseMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-387">
-          <caret line="67" column="14" selection-start-line="67" selection-start-column="14" selection-end-line="67" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/AlumniOrgMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/AlumniReturnMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SystemMenuMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmsCodeMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/AlumniNewsMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/WxAccessTokenService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="276">
@@ -607,13 +635,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubApplyController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="59">
-          <caret line="251" column="69" selection-start-line="251" selection-start-column="69" selection-end-line="251" selection-end-column="69" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/AlumniActivityPageVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="295">
@@ -670,13 +691,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniActivityController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="18653">
-          <caret line="844" column="27" selection-start-line="844" selection-start-column="27" selection-end-line="844" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniEndorseController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="3289">
@@ -739,13 +753,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/FileController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/aop/LoginCheckAspect.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="292">
@@ -753,13 +760,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="351" column="60" selection-start-line="351" selection-start-column="60" selection-end-line="351" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/AlumniUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="691">
@@ -802,16 +802,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="79">
-          <caret line="340" column="34" selection-start-line="340" selection-start-column="34" selection-end-line="340" selection-end-column="34" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/AlumniImageService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="121">
@@ -836,14 +826,14 @@
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniImageController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="183">
-          <caret line="54" column="25" lean-forward="true" selection-start-line="54" selection-start-column="25" selection-end-line="54" selection-end-column="25" />
+          <caret line="54" column="25" selection-start-line="54" selection-start-column="25" selection-end-line="54" selection-end-column="25" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/ImagePageVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="281">
-          <caret line="51" column="7" lean-forward="true" selection-start-line="51" selection-start-column="7" selection-end-line="51" selection-end-column="7" />
+          <caret line="51" column="7" selection-start-line="51" selection-start-column="7" selection-end-line="51" selection-end-column="7" />
         </state>
       </provider>
     </entry>
@@ -861,10 +851,90 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubApplyController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="387">
+          <caret line="107" column="57" selection-start-line="107" selection-start-column="57" selection-end-line="107" selection-end-column="62" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/WeiXiaoUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="274" column="59" selection-start-line="274" selection-start-column="59" selection-end-line="274" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/FileController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="287">
+          <caret line="49" column="49" selection-start-line="49" selection-start-column="49" selection-end-line="49" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniAdminApplyController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniCategoryImageController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="585">
-          <caret line="109" column="52" selection-start-line="109" selection-start-column="52" selection-end-line="109" selection-end-column="52" />
+        <state relative-caret-position="332">
+          <caret line="98" column="54" selection-start-line="98" selection-start-column="54" selection-end-line="98" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniCategoryNewsController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2116">
+          <caret line="112" column="29" selection-start-line="112" selection-start-column="25" selection-end-line="112" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/ActivityImageController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="322">
+          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/ActivityReportController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniActivityController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15422">
+          <caret line="844" column="27" selection-start-line="844" selection-start-column="27" selection-end-line="844" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="499">
+          <caret line="594" column="92" lean-forward="true" selection-start-line="591" selection-start-column="16" selection-end-line="594" selection-end-column="92" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniClubController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="269">
+          <caret line="67" column="23" selection-start-line="67" selection-start-column="19" selection-end-line="67" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniUserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="518">
+          <caret line="264" column="79" selection-start-line="264" selection-start-column="79" selection-end-line="264" selection-end-column="79" />
         </state>
       </provider>
     </entry>

logs/smart-2024-12-21.log

@@ -0,0 +1,9 @@
+2024-12-21 12:12:11.823 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-21 12:12:11.952 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler'
+2024-12-21 12:12:11.953 [SpringContextShutdownHook] INFO  o.s.s.quartz.SchedulerFactoryBean - Shutting down Quartz Scheduler
+2024-12-21 12:12:11.954 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutting down.
+2024-12-21 12:12:11.954 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-12-21 12:12:11.955 [SpringContextShutdownHook] INFO  org.quartz.core.QuartzScheduler - Scheduler quartzScheduler_$_NON_CLUSTERED shutdown complete.
+2024-12-21 12:12:11.957 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-12-21 12:12:11.960 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+2024-12-21 12:12:11.965 [SpringContextShutdownHook] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.

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

@@ -293,6 +293,8 @@ public class AlumniClubController implements AlumniClubControllerAPI {
                         }else if(oExist.get().getIsPass().intValue() == ePassType.Passed.getValue()){
                             result.setIsJoin(ejoinType.Join.getValue());
                         }
+                    }else{
+                        result.setIsJoin(ejoinType.Unjoin.getValue());
                     }
                 }else{
                     result.setIsJoin(ejoinType.Unjoin.getValue());
@@ -330,6 +332,8 @@ public class AlumniClubController implements AlumniClubControllerAPI {
                     }else if(oExist.get().getIsPass().intValue() == ePassType.Passed.getValue()){
                         data.setIsJoin(ejoinType.Join.getValue());
                     }
+                }else{
+                    data.setIsJoin(ejoinType.Unjoin.getValue());
                 }
             }else{
                 data.setIsJoin(ejoinType.Unjoin.getValue());

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

@@ -229,7 +229,11 @@ public class AlumniUserController implements AlumniUserControllerAPI {
                 AlumniMobileUserPageVo npv = new AlumniMobileUserPageVo();
                 npv.setId(pg.getId());
                 npv.setName(pg.getName());
-                npv.setCollegeName(pg.getCollegeName()+"》"+pg.getPeriodName()+"》"+pg.getMajorName()+"》"+pg.getClassName());
+                String collegeName = pg.getCollegeName() == null ? "" : pg.getCollegeName();
+                String periodName = pg.getPeriodName() == null ? "" : "》" + pg.getPeriodName();
+                String majorName = pg.getMajorName() == null ? "" : "》" + pg.getMajorName();
+                String className = pg.getClassName() == null ? "" : "》" + pg.getClassName();
+                npv.setCollegeName(collegeName+periodName+majorName+className);
                 npv.setName(pg.getName());
                 npv.setOrgName(pg.getOrgName());
                 npv.setPhone(pg.getPhone());
@@ -254,7 +258,11 @@ public class AlumniUserController implements AlumniUserControllerAPI {
                 AlumniMobileUserPageVo npv = new AlumniMobileUserPageVo();
                 npv.setId(pg.getId());
                 npv.setName(pg.getName());
-                npv.setCollegeName(pg.getCollegeName()+"》"+pg.getPeriodName()+"》"+pg.getMajorName()+"》"+pg.getClassName());
+                String collegeName = pg.getCollegeName() == null ? "" : pg.getCollegeName();
+                String periodName = pg.getPeriodName() == null ? "" : "》" + pg.getPeriodName();
+                String majorName = pg.getMajorName() == null ? "" : "》" + pg.getMajorName();
+                String className = pg.getClassName() == null ? "" : "》" + pg.getClassName();
+                npv.setCollegeName(collegeName+periodName+majorName+className);
                 npv.setName(pg.getName());
                 npv.setOrgName(pg.getOrgName());
                 npv.setPhone(pg.getPhone());