Explorar o código

删除百胜希沃

夏文涛 %!s(int64=2) %!d(string=hai) anos
pai
achega
ad9a90abb4

+ 98 - 65
.idea/workspace.xml

@@ -2,12 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6c5cf517-721b-44b7-afae-e7b1b913b988" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/BsDeleteStudentVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" 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$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -25,8 +24,24 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="430">
-              <caret line="880" selection-start-line="880" selection-end-line="880" />
+            <state relative-caret-position="547">
+              <caret line="2558" column="8" selection-start-line="2558" selection-start-column="8" selection-end-line="2558" selection-end-column="8" />
+              <folding>
+                <element signature="e#94443#94460#0" />
+                <element signature="e#96633#96648#0" />
+                <element signature="e#98960#98975#0" />
+                <element signature="e#110744#117713#0" />
+                <element signature="e#117719#118368#0" />
+              </folding>
+            </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="315">
+              <caret line="77" column="36" selection-start-line="77" selection-start-column="17" selection-end-line="77" selection-end-column="36" />
             </state>
           </provider>
         </entry>
@@ -90,8 +105,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="624">
-              <caret line="86" column="43" selection-start-line="86" selection-start-column="20" selection-end-line="86" selection-end-column="43" />
+            <state relative-caret-position="223">
+              <caret line="27" column="37" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="37" />
             </state>
           </provider>
         </entry>
@@ -107,16 +122,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>updateSmartUserById</find>
-      <find>oldSchoolClass</find>
-      <find>getTeacherScoreList</find>
-      <find>public</find>
-      <find>.order</find>
-      <find>querySmartSemesters</find>
-      <find>月份</find>
-      <find>第一天</find>
-      <find>time</find>
-      <find>.valueOf</find>
       <find>eAttendanceStatu</find>
       <find>new Array</find>
       <find>扫码</find>
@@ -134,9 +139,19 @@
       <find>从0开始统计数量 所以得+1</find>
       <find>importSmartScoreExcel</find>
       <find>headImage</find>
-      <find>cardNo</find>
       <find>百胜新增</find>
       <find>导入</find>
+      <find>departmentId</find>
+      <find>删除</find>
+      <find>deleteSmartUserById</find>
+      <find>百胜删除</find>
+      <find>delete</find>
+      <find>del</find>
+      <find>deleteSma</find>
+      <find>cardNo</find>
+      <find>百胜</find>
+      <find>SeewoDeleteStudent</find>
+      <find>deleteOldParentShip</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -232,7 +247,7 @@
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
-    <option name="width" value="958" />
+    <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectView">
@@ -298,7 +313,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
+              <item name="api" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -308,7 +323,6 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="common" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -488,18 +502,18 @@
       <option name="presentableId" value="Default" />
       <updated>1707008840183</updated>
       <workItem from="1707008843054" duration="16121000" />
-      <workItem from="1708481187426" duration="72681000" />
+      <workItem from="1708481187426" duration="78859000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="88802000" />
+    <option name="totallyTimeSpent" value="94980000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="958" height="1039" extended-state="0" />
+    <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" visible="true" weight="0.24387528" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.11673774" />
       <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" />
@@ -510,8 +524,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" visible="true" weight="0.33701658" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.84573305" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.33701658" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.8165746" />
       <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" />
@@ -519,7 +533,7 @@
       <window_info anchor="bottom" id="Terminal" order="8" />
       <window_info anchor="bottom" id="Docker" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.32932165" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32928178" />
       <window_info anchor="bottom" id="Java Enterprise" order="12" />
       <window_info anchor="bottom" id="Database Changes" order="13" />
       <window_info anchor="bottom" id="Version Control" order="14" />
@@ -528,7 +542,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.8262806" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.7461707" />
       <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" />
@@ -546,13 +560,13 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>2121</line>
+          <line>2120</line>
           <properties />
           <option name="timeStamp" value="14" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1527</line>
+          <line>1526</line>
           <properties />
           <option name="timeStamp" value="15" />
         </line-breakpoint>
@@ -564,7 +578,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1183</line>
+          <line>1182</line>
           <properties />
           <option name="timeStamp" value="17" />
         </line-breakpoint>
@@ -600,7 +614,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1472</line>
+          <line>1471</line>
           <properties />
           <option name="timeStamp" value="57" />
         </line-breakpoint>
@@ -622,24 +636,22 @@
           <properties />
           <option name="timeStamp" value="62" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
+          <line>2004</line>
+          <properties />
+          <option name="timeStamp" value="64" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
+          <line>2027</line>
+          <properties />
+          <option name="timeStamp" value="65" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartWarningController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1072">
-          <caret line="52" column="3" lean-forward="true" selection-start-line="52" selection-start-column="3" selection-end-line="52" selection-end-column="3" />
-        </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="322">
-          <caret line="54" column="10" selection-start-line="54" selection-start-column="10" selection-end-line="54" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScreenshotRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-336">
@@ -926,20 +938,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eIdentityStatu.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="624">
-          <caret line="86" column="43" selection-start-line="86" selection-start-column="20" selection-end-line="86" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSexStatu.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="575">
@@ -984,10 +982,45 @@
         </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="315">
+          <caret line="77" column="36" selection-start-line="77" selection-start-column="17" selection-end-line="77" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/useridsRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="299">
+          <caret line="16" column="26" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="223">
+          <caret line="27" column="37" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eIdentityStatu.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/SmartUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="880" selection-start-line="880" selection-end-line="880" />
+        <state relative-caret-position="547">
+          <caret line="2558" column="8" selection-start-line="2558" selection-start-column="8" selection-end-line="2558" selection-end-column="8" />
+          <folding>
+            <element signature="e#94443#94460#0" />
+            <element signature="e#96633#96648#0" />
+            <element signature="e#98960#98975#0" />
+            <element signature="e#110744#117713#0" />
+            <element signature="e#117719#118368#0" />
+          </folding>
         </state>
       </provider>
     </entry>

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

@@ -75,7 +75,7 @@ public interface SmartUserControllerAPI {
 
     @PostMapping(value = "/deleteSmartUserById")
     @ApiOperation(value = "根据ID删除指定用户", notes = "根据ID删除指定用户", httpMethod = "POST")
-    CommonResult deleteSmartUserById(@Validated @RequestBody useridsRequest ur, BindingResult bindingResult);
+    CommonResult deleteSmartUserById(@Validated @RequestBody useridsRequest ur, BindingResult bindingResult) throws Exception;
 
     /**
      * 学生家长预约信息填写界面获取受访学生列表

+ 75 - 15
src/main/java/com/template/controller/SmartUserController.java

@@ -176,9 +176,9 @@ public class SmartUserController implements SmartUserControllerAPI {
             Optional<String> image = uploadImages == null ? null : uploadImages.stream().filter(e -> e.equals("https://wanzai-1306339220.cos.ap-shanghai.myqcloud.com/" + user.getHeadImage())).findFirst();
             if (image != null && image.isPresent()) {
                 user.setHeadImage(image.get());
-            }else{
-                if(user.getIdentityId().equals(eIdentityStatu.Student.getValue())){
-                    return CommonResult.fail(user.getName()+"头像不存在,导入失败");
+            } else {
+                if (user.getIdentityId().equals(eIdentityStatu.Student.getValue())) {
+                    return CommonResult.fail(user.getName() + "头像不存在,导入失败");
                 }
 
             }
@@ -190,9 +190,9 @@ public class SmartUserController implements SmartUserControllerAPI {
         //判断是否存在重复数据
         List<String> cardNos = studentDatas.stream().map(SmartUser::getCardNo).collect(Collectors.toList());
         List<SmartUser> existUsers = smartUserService.querySmartUserByCardNos(cardNos);
-        if(existUsers != null && existUsers.size() > 0){
-            String names = StringUtils.join(existUsers.stream().map(SmartUser::getName).collect(Collectors.toList()),",");
-            return CommonResult.fail("系统中已存在"+names+"的信息数据,请勿重复导入");
+        if (existUsers != null && existUsers.size() > 0) {
+            String names = StringUtils.join(existUsers.stream().map(SmartUser::getName).collect(Collectors.toList()), ",");
+            return CommonResult.fail("系统中已存在" + names + "的信息数据,请勿重复导入");
         }
 
         for (SmartUser student : studentDatas) {
@@ -625,7 +625,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                         Optional<SmartDepartment> departModel = departments.stream().filter(e -> e.getName().equals(department)).findFirst();
                         if (departModel != null && departModel.isPresent()) {
                             departmentId = departModel.get().getId();
-                        }else{
+                        } else {
                             departmentId = 1;
                         }
 
@@ -661,7 +661,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                             Integer gradeId = oGrade.get().getId();
                             user.setGrade(String.valueOf(gradeId));
                             String schoolClassStr = schoolClass.replace("grade", "");
-                            Optional<SmartClass> oClass = classs.stream().filter(e -> (grade+e.getName()).equals(schoolClassStr) && e.getGradeId().equals(gradeId)).findFirst();
+                            Optional<SmartClass> oClass = classs.stream().filter(e -> (grade + e.getName()).equals(schoolClassStr) && e.getGradeId().equals(gradeId)).findFirst();
                             if (oClass != null && oClass.isPresent()) {
                                 user.setSchoolClass(oClass.get().getId());
                             } else {
@@ -875,11 +875,10 @@ public class SmartUserController implements SmartUserControllerAPI {
                         Optional<SmartDepartment> departModel = departments.stream().filter(e -> e.getName().equals(department)).findFirst();
                         if (departModel != null && departModel.isPresent()) {
                             departmentId = departModel.get().getId();
-                        }else{
+                        } else {
                             departmentId = 1;
                         }
 
-
                         //学号重复判断
                         String cardNo = dataFormatter.formatCellValue(row.getCell(1));
                         if (!ObjectUtils.isEmpty(cardNo)) {
@@ -912,7 +911,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                             Integer gradeId = oGrade.get().getId();
                             user.setGrade(String.valueOf(gradeId));
                             String schoolClassStr = schoolClass.replace("grade", "");
-                            Optional<SmartClass> oClass = classs.stream().filter(e -> (grade+e.getName()).equals(schoolClassStr) && e.getGradeId().equals(gradeId)).findFirst();
+                            Optional<SmartClass> oClass = classs.stream().filter(e -> (grade + e.getName()).equals(schoolClassStr) && e.getGradeId().equals(gradeId)).findFirst();
                             if (oClass != null && oClass.isPresent()) {
                                 user.setSchoolClass(oClass.get().getId());
                             } else {
@@ -2485,18 +2484,79 @@ public class SmartUserController implements SmartUserControllerAPI {
 
     @Override
     @DESRespondSecret(validated = true)
-    public CommonResult deleteSmartUserById(useridsRequest ur, BindingResult bindingResult) {
+    public CommonResult deleteSmartUserById(useridsRequest ur, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
 
-        int data = smartUserService.getSmartUserCountByIds(ur.getUserIds());
-
-        if (data != ur.getUserIds().size()) {
+        List<SmartUser> users = smartUserService.getSmartUserByIds(ur.getUserIds());
+        if (users.size() != ur.getUserIds().size()) {
             return CommonResult.fail("存在无效用户数据,删除失败!");
         }
 
+        SeewoClient seewoClient = new DefaultSeewoClient(new Account(seewoConfig.getAppId(), seewoConfig.getAppSecret()));
+        for (SmartUser user : users) {
+            if (user.getIdentityId().intValue() == eIdentityStatu.Parent.getValue()) {
+                List<String> studentIds = Arrays.asList(user.getAffiliate().split(","));
+                List<SmartUser> studentDatas = smartUserService.getSmartUserIds(studentIds);
+
+                //region 删除原有的家长关系
+                CommonResult deleteResult = deleteOldParentShip(seewoClient, studentDatas, user.getPhone());
+                if (!deleteResult.isSuccess()) {
+                    return CommonResult.fail(deleteResult.getMessage());
+                }
+                //endregion
+            } else if (user.getIdentityId().intValue() == eIdentityStatu.Student.getValue()) {
+                //获取班级Uid
+                SmartClass classData = smartClassService.getSmartClassById(user.getSchoolClass());
+                if (classData == null) {
+                    return CommonResult.fail("班级数据无效,更新失败");
+                }
+                //region 百胜删除学生
+                CommonResult deleteBsStudent = bsDeleteStudent(user);
+                if (!deleteBsStudent.isSuccess()) {
+                    return CommonResult.fail(deleteBsStudent.getMessage());
+                }
+                //endregion
+
+                //region 希沃删除学生
+                CommonResult deleteStudent = SeewoDeleteStudent(seewoClient, classData.getClassUid(), user.getCardNo());
+                if (!deleteStudent.isSuccess()) {
+                    return CommonResult.fail(deleteStudent.getMessage());
+                }
+                //endregion
+            } else if(user.getIdentityId().intValue() == eIdentityStatu.Teacher.getValue()){
+                //获取班级Uid
+                SmartClass classData = smartClassService.getSmartClassById(user.getSchoolClass());
+                if (classData == null) {
+                    return CommonResult.fail("班级数据无效,更新失败");
+                }
+
+                //region 希沃删除教师
+                CommonResult deleteTeacher = SeewoDeleteTeacher(seewoClient, user.getPhone());
+                if (!deleteTeacher.isSuccess()) {
+                    return CommonResult.fail(deleteTeacher.getMessage());
+                }
+                //endregion
+
+                //region 希沃删除班主任
+                CommonResult deleteTeacherMaster = SeewoDeleteTeacherMaster(seewoClient, classData.getClassUid(), user.getPhone());
+                if (deleteTeacherMaster.isSuccess()) {
+                    return CommonResult.fail(deleteTeacherMaster.getMessage());
+                }
+                //endregion
+
+                //region 百胜删除教师
+                CommonResult bsDeleteTeacher = bsDeleteTeacher(user.getBsStaffCode());
+                if (!bsDeleteTeacher.isSuccess()) {
+                    return CommonResult.fail(bsDeleteTeacher.getMessage());
+                }
+                //endregion
+            }
+
+        }
+
         int result = smartUserService.deleteSmartUserByIds(ur.getUserIds());
 
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");

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