update

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TeacherController.java

@@ -365,13 +365,6 @@ public class TeacherController extends BaseController {
     public HttpResponseResult updateLock(@PathVariable("teacherId") Long teacherId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         teacherService.updateLock(sysUser, teacherId);
-        if(sysUser != null) {
-        	if(sysUser.getTenantId() == null || sysUser.getTenantId() == -1) {
-                sysUserFeignService.exitByPhone(ClientEnum.TEACHER.getCode().toLowerCase(), sysUser.getPhone());
-        	}else {
-                sysUserFeignService.exitByPhone(ClientEnum.TENANT_TEACHER.getCode().toLowerCase(), sysUser.getPhone());
-        	}
-        }
         return succeed();
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -1644,6 +1644,15 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             }*/
         }
         teacher.setLockFlag(UserLockFlag.NORMAL.equals(teacher.getLockFlag()) ? UserLockFlag.LOCKED : UserLockFlag.NORMAL);
+
+        if(teacher.getLockFlag() == UserLockFlag.LOCKED){
+        	if(sysUser.getTenantId() == null || sysUser.getTenantId() == -1) {
+        		userFeignService.exitByPhone(ClientEnum.TEACHER.getCode().toLowerCase(), sysUser.getPhone());
+        	}else {
+        		userFeignService.exitByPhone(ClientEnum.TENANT_TEACHER.getCode().toLowerCase(), sysUser.getPhone());
+        	}
+        }
+        
         this.updateById(teacher);
     }