BUG处理

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

@@ -160,7 +160,6 @@ public class GradeServiceImpl implements GradeService{
             throw new BizException(BizExceptionCode.USELESS_DATA);
         }
         Long school_id = BaseContextHolder.getSchoolId();
-        school_id = 1l;
         SysGrade sysGrade = new SysGrade();
         sysGrade.setGrade_status(1);
         sysGrade.setSchool_id(school_id);

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

@@ -26,7 +26,6 @@ public class SchoolServiceImpl implements SchoolService {
             throw new BizException(BizExceptionCode.USELESS_DATA);
         }
         Long school_id = BaseContextHolder.getSchoolId();
-        school_id = 1l;
         SysSchool school = sysSchoolMapper.selectByPrimaryKey(school_id);
         return school;
     }

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

@@ -74,7 +74,6 @@ public class StudentServiceImpl implements StudentService{
         List<SysParents> items = formdata.getItems();
         Long id = student.getStu_id();
         Long schoolid = BaseContextHolder.getSchoolId();
-        schoolid = 1l;
         //插入从表数据
         List<SysParents> insertDetails = new ArrayList<>();
         //更新从表数据

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

@@ -34,7 +34,6 @@ public class SubjectServiceImpl implements SubjectService {
     public PageInfo<Subject> getListData(PageRequest page, ListReqDTO listReqDTO) {
         PageHelper.startPage(page.getNumber(), page.getSize());
         Long schoolId = BaseContextHolder.getSchoolId();
-        schoolId = 1l;
         //condition语句
         String condition = listReqDTO.getFinalCondition();
         if(condition == null){

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

@@ -46,7 +46,6 @@ public class TeacherServiceImpl implements TeacherService{
         if(condition == null){
             condition = "1=1";
         }
-        schoolId = 1l;
         List<SysTeacher> teacherList = sysTeacherMapper.selectByConditon(condition, schoolId);
         PageInfo<SysTeacher> list = new PageInfo<>(teacherList);
         return list;
@@ -71,7 +70,6 @@ public class TeacherServiceImpl implements TeacherService{
             throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
         Long school_id = BaseContextHolder.getSchoolId();
-        school_id = 1l;
         formdata.setSchool_id(school_id);
         formdata.setTeacher_status(1);
         //新增教师
@@ -114,6 +112,7 @@ public class TeacherServiceImpl implements TeacherService{
                     teacher.setSchool_id(schoolId);
                     teacher.setTeacher_status(1);
                     sysTeacherMapper.insertSelective(teacher);
+                    teachers.add(teacher);
                     //年纪存在、需要更新
                 } else if (update){
                     teacher.setSchool_id(schoolId);

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/service/impl/HomeWorkServiceImpl.java

@@ -34,7 +34,6 @@ public class HomeWorkServiceImpl implements HomeWorkService{
             throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
         Long school_id = BaseContextHolder.getSchoolId();
-        school_id = 1l;
         formdata.setSchool_id(school_id);
         //新增
         if (StringUtils.isEmpty(formdata.getTask_id()) || "0".equals(formdata.getTask_id().toString())) {
@@ -52,7 +51,6 @@ public class HomeWorkServiceImpl implements HomeWorkService{
     public PageInfo<HomeWork> getListData(PageRequest page, ListReqDTO listReqDTO) {
         PageHelper.startPage(page.getNumber(), page.getSize());
         Long schoolId = BaseContextHolder.getSchoolId();
-        schoolId = 1l;
         //condition语句
         String condition = listReqDTO.getFinalCondition();
         if(condition == null){

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/service/impl/InOutRecordServiceImpl.java

@@ -27,7 +27,6 @@ public class InOutRecordServiceImpl implements InOutRecordService{
     public PageInfo<OutInRecord> getListData(PageRequest page, ListReqDTO listReqDTO) {
         PageHelper.startPage(page.getNumber(), page.getSize());
         Long schoolId = BaseContextHolder.getSchoolId();
-        schoolId = 1l;
         //condition语句
         String condition = listReqDTO.getFinalCondition();
         if(condition == null){

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/service/impl/NoticeServiceImpl.java

@@ -34,7 +34,6 @@ public class NoticeServiceImpl implements NoticeService{
             throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
         Long school_id = BaseContextHolder.getSchoolId();
-        school_id = 1l;
         formdata.setSchool_id(school_id);
         //新增
         if (StringUtils.isEmpty(formdata.getNotify_id()) || "0".equals(formdata.getNotify_id().toString())) {
@@ -52,7 +51,6 @@ public class NoticeServiceImpl implements NoticeService{
     public PageInfo<Notify> getListData(PageRequest page, ListReqDTO listReqDTO) {
         PageHelper.startPage(page.getNumber(), page.getSize());
         Long schoolId = BaseContextHolder.getSchoolId();
-        schoolId = 1l;
         //condition语句
         String condition = listReqDTO.getFinalCondition();
         if(condition == null){

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/service/impl/PrincipalMailServiceImpl.java

@@ -35,7 +35,6 @@ public class PrincipalMailServiceImpl implements PrincipalMailService {
     public PageInfo<PrincipalMail> getListData(PageRequest page, ListReqDTO listReqDTO) {
         PageHelper.startPage(page.getNumber(), page.getSize());
         Long schoolId = BaseContextHolder.getSchoolId();
-        schoolId = 1l;
         //condition语句
         String condition = listReqDTO.getFinalCondition();
         if(condition == null){

frontend/pc-web/app/view/basic/staff/StaffList.js

@@ -109,7 +109,7 @@ Ext.define('school.view.basic.staff.StaffList', {
                     width: 120
                 }, {
                     text: '手机号',
-                    dataIndex: 'phone',
+                    dataIndex: 'teacher_phone',
                     width: 120
                 }, {
                     text: '性别',