Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

.idea/workspace.xml

@@ -256,12 +256,26 @@
     <option name="showExcludedFiles" value="false" />
     <option name="showLibraryContents" value="true" />
   </component>
+<<<<<<< HEAD
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "WebServerToolWindowFactoryState": "false",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "settings.editor.selected.configurable": "MavenSettings",
+    "spring.configuration.checksum": "64bf9ba214eb006c40cb35e0f61a7d20"
+  }
+}]]></component>
+=======
   <component name="PropertiesComponent">
     <property name="RequestMappingsPanelOrder0" value="0" />
     <property name="RequestMappingsPanelOrder1" value="1" />
     <property name="RequestMappingsPanelWidth0" value="75" />
     <property name="RequestMappingsPanelWidth1" value="75" />
   </component>
+>>>>>>> 705bff9b8ab94f5be1657f1e650429f9c7f0a795
   <component name="RebelAgentSelection">
     <selection>jr</selection>
   </component>
@@ -303,7 +317,7 @@
       <workItem from="1706250887209" duration="8970000" />
       <workItem from="1706250887209" duration="5674000" />
       <workItem from="1706260354151" duration="17000" />
-      <workItem from="1706260659198" duration="67000" />
+      <workItem from="1706260659198" duration="1213000" />
     </task>
     <servers />
   </component>
@@ -397,6 +411,11 @@
           <properties />
           <option name="timeStamp" value="1" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/WxGzhController.java</url>
+          <line>137</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>

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

@@ -131,6 +131,10 @@ public class WxGzhController implements WxGzhControllerAPI {
     @Override
     @PassToken
     public CommonResult unbinding(String phone) {
+        if (ObjectUtils.isEmpty(phone)) {
+            return CommonResult.fail("参数异常");
+        }
+
         QueryWrapper<SmartUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("deleted", 0);
         queryWrapper.eq("phone", phone);