Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/TeacherServiceImpl.java

@@ -82,15 +82,13 @@ public class TeacherServiceImpl implements TeacherService{
             if(sysTeacherMapper.count(formdata.getTeacher_number(), formdata.getSchool_id()) > 0){
                 throw new BizException(BizExceptionCode.REPEAT_TEACHER_NUMBER);
             }
-            sysTeacherMapper.insertSelective(formdata);
             //新增账户,并更新教师表UserId字段
             if (!StringUtils.isEmpty(formdata.getTeacher_phone())) {
                 Long userId = createAccount(formdata);
-                SysTeacher sysTeacher = new SysTeacher();
-                sysTeacher.setTeacher_id(formdata.getTeacher_id());
-                sysTeacher.setUser_id(userId);
-                sysTeacherMapper.updateByPrimaryKeySelective(sysTeacher);
+                formdata.setUser_id(userId);
             }
+            sysTeacherMapper.insertSelective(formdata);
+
         } else {
             //更新教师
             if(sysTeacherMapper.count(formdata.getTeacher_number(), formdata.getSchool_id()) > 0 &&

applications/school/school-server/src/main/resources/mapper/CurriculumMapper.xml

@@ -51,6 +51,7 @@
         and mcur.school_id = #{schoolId}
       </if>
     </where>
+    ORDER BY id DESC
   </select>
 
   <select id="selectMain" resultMap="CurriculumDTOMap">

frontend/wechat-web/src/modules/home/HomePage.jsx

@@ -122,9 +122,12 @@ class HomePage extends Component {
         return (
             <div className='home-page-root'>
                 <div className='home-top-layout-root'>
-                    <div className='home-student-layout-root'>
-                        {studentList}
-                    </div>
+                    {
+                        this.props.userInfo.userRole == 1 ?
+                            <div className='home-student-layout-root'>
+                                {studentList}
+                            </div> : ''
+                    }
                     {this.userInfoLayout()}
                     <div className="white_san_jiao"></div>
                 </div>
@@ -412,23 +415,28 @@ class HomePage extends Component {
     onStuSwitch = (stuIndex) => {
         console.log("onStuSwitch",stuIndex)
 
-       /* if(stuIndex == 0){
-            return
-        }else {
-            const studentList =  this.props.userInfo.parent.students
-            var centerStu = studentList[stuIndex]
-            switchUser({
-                parent:{
-                    ...this.props.userInfo.parent,
-                    students:studentList,
-                    student:centerStu
-                },
-                user:{
-                    ...this.props.userInfo.parent,
-                    students:studentList,
-                    student:centerStu
-                }
-            })()
+       /* if (stuIndex != 0) {
+            Toast.loading('学生切换中...', 0)
+            setTimeout(() => {
+                Toast.success('切换成功!', 1)
+                const studentList =  this.props.userInfo.parent.students
+                const centerStu = studentList[stuIndex]
+                studentList[stuIndex] = studentList[0]
+                studentList[0] = centerStu
+
+                switchUser({
+                    parent: {
+                        ...this.props.userInfo.parent,
+                        students:studentList,
+                        student: centerStu
+                    },
+                    user: {
+                        ...this.props.userInfo.parent,
+                        students:studentList,
+                        student: centerStu
+                    }
+                })()
+            }, 400)
         }*/
         if (this.state.studentIndex !== stuIndex) {
             Toast.loading('学生切换中...', 0)
@@ -449,7 +457,6 @@ class HomePage extends Component {
                 })()
             }, 400)
         }
-
     }
 
     getTeacherMenu = () => {
@@ -551,9 +558,9 @@ class StuItem extends Component {
                         <Avatar className={this.props.isSelect ? 'border-radius-50-blue' : 'border-radius-50'}
                                 size={30} icon='user'/>
                 }
-                {/*<span*/}
-                    {/*className={this.props.isSelect ? "margin_left_5 color_blue text_bold"*/}
-                        {/*: 'margin_left_5'}>{this.props.stuObj.stuName}</span>*/}
+              {/*  <span
+                    className={this.props.isSelect ? "margin_left_5 color_blue text_bold"
+                        : 'margin_left_5'}>{this.props.stuObj.stuName+','+this.props.isSelect}</span>*/}
             </div>
         );
     }

frontend/wechat-web/src/style/css/home-page.css

@@ -131,7 +131,7 @@
     font-family: PingFangSC-Regular;
     font-size: 12px;
     letter-spacing: 1.6px;
-    padding: 5px 10px;
+    padding: 5px 10px 0px 10px;
     float: left;
     text-align: center;
 }