代码修改

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Subject.java

@@ -135,10 +135,4 @@ public class Subject implements Serializable {
 	public void setDesc(String desc) {
 		this.desc = desc;
 	}
-
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
 }

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

@@ -15,6 +15,7 @@ import com.yonge.cooleshow.common.enums.CacheNameEnum;
 import com.yonge.cooleshow.biz.dal.service.StudentTotalService;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.UserLockFlag;
 import com.yonge.toolset.utils.date.DateUtil;
 import com.yonge.toolset.utils.string.ValueUtil;
 import org.apache.commons.beanutils.BeanUtils;
@@ -137,6 +138,9 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         if (null == detail) {
             return HttpResponseResult.failed("未找老师信息");
         }
+        if (UserLockFlag.LOCKED.equals(detail.getLockFlag())) {
+            return HttpResponseResult.failed("老师被锁定");
+        }
         if (null == old || (null != isUpdate && isUpdate)) {
             //更新
             //删除用户绑定

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserBindingTeacherMapper.xml

@@ -3,14 +3,14 @@
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.UserBindingTeacherDao">
     <select id="selectStudent" resultType="com.yonge.cooleshow.biz.dal.vo.CourseStudentVo">
         SELECT
-        su.id_ AS userId,
-        su.username_ AS userName,
-        su.real_name_ AS realName,
-        su.avatar_ AS avatar,
-        su.phone_ AS phone,
-        (SELECT group_concat(name_) FROM `subject` WHERE find_in_set(id_,s.subject_id_)) AS subjectName,
---         IFNULL(TIMESTAMPDIFF(DAY,b.last_end_class_,NOW()),TIMESTAMPDIFF(DAY,b.created_time_,NOW())) AS lastEndClass
-        TIMESTAMPDIFF(DAY,b.last_end_class_,NOW()) AS lastEndClass
+            su.id_ AS userId,
+            su.username_ AS userName,
+            su.real_name_ AS realName,
+            su.avatar_ AS avatar,
+            su.phone_ AS phone,
+            (SELECT group_concat(name_) FROM `subject` WHERE find_in_set(id_,s.subject_id_)) AS subjectName,
+    --         IFNULL(TIMESTAMPDIFF(DAY,b.last_end_class_,NOW()),TIMESTAMPDIFF(DAY,b.created_time_,NOW())) AS lastEndClass
+            TIMESTAMPDIFF(DAY,b.last_end_class_,NOW()) AS lastEndClass
         FROM user_binding_teacher b
         LEFT JOIN sys_user su ON b.student_id_=su.id_
         LEFT JOIN student s ON b.student_id_=s.user_id_
@@ -68,6 +68,7 @@
             (case when isnull(u.id_card_no_) then 0 else 1 end) as isReal,
             u.real_name_ as realName,
             u.id_card_no_ as idCardNo,
+            u.lock_flag_ as lockFlag,
             (
                 SELECT GROUP_CONCAT(name_) FROM subject WHERE FIND_IN_SET(id_,t.subject_id_)
             ) as subjectName