diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java
index 815a5c8..e43ae21 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java
@@ -152,7 +152,7 @@ public class CphSqlServerDataController extends BaseController {
         return success(list);
     }
 
-    //同步教职工
+    //同步辅导员
     @RequestMapping("/synchronousEmployEEInfoList")
     public AjaxResult synchronousEmployEEInfoList(){
         //startPage();
diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java
index d90ae4d..a4f7b63 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java
@@ -31,8 +31,8 @@ public class SyncDataController extends BaseController {
     @RequestMapping("/synchronousEmployEEInfoList")
     public AjaxResult synchronousEmployEEInfoList(){
         List<Map> list=syncDataService.getEmployEEInfoList();
-        iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工
-        iCphTeacherService.Usertb();
+        iCphTeacherService.synchronousMYSQL(list);//同步教职工
+        iCphTeacherService.UsertbNew();
         return success();
     }
     //专业
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphTeacherService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphTeacherService.java
index c73a947..b1d586c 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphTeacherService.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphTeacherService.java
@@ -117,8 +117,10 @@ public interface ICphTeacherService
     public Map<String, Integer> teacherDataSync();
 
     void sqlserverSynchronousMYSQL(List<Map> list);
+    void synchronousMYSQL(List<Map> list);
 
     void Usertb();
+    void UsertbNew();
 
     void insertUserrole(List<SysUser> insertUser);
 
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java
index 4af48a0..c5dc26c 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java
@@ -354,116 +354,116 @@ public class CphTeacherServiceImpl implements ICphTeacherService
     }
 
     //同步辅导员
-//    @Override
-//    @Transactional(rollbackFor = Exception.class)
-//    public void sqlserverSynchronousMYSQL(List<Map> list) {
-//        //辅导员列表
-//        List<CphTeacher> cphTeachers = cphTeacherMapper.selectTeacherList();
-//        //查找重复值
-//        List<Map> updateMap = list.stream()
-//                .filter(obj1 -> cphTeachers
-//                        .stream().anyMatch(obj2 -> {
-//                            Object xhObj = obj1.get("zgh");
-//                            if (xhObj != null) {
-//                                String zgh = xhObj.toString();
-//                                return obj2.getEmployeeId().equals(zgh);
-//                            }
-//                            return false;
-//                        }))
-//                .collect(Collectors.toList());
-//
-//        //添加需要
-//        List<String> kshList2 = cphTeachers.stream()
-//                .map(CphTeacher::getEmployeeId)
-//                .collect(Collectors.toList());
-//
-//        List<Map> insertMap = list.stream()
-//                .filter(obj -> {
-//                    Object xhObj = obj.get("zgh");
-//                    return xhObj != null && !kshList2.contains(xhObj.toString());
-//                })
-//                .collect(Collectors.toList());
-//        //添加
-//        List<CphTeacher> insertStudentList = new ArrayList<>();
-//        for (Map map:insertMap){
-//            CphTeacher cphTeacher = new CphTeacher();
-//            Object xmObj = map.get("xm");
-//            if (xmObj != null) {
-//                cphTeacher.setName(xmObj.toString());
-//            }
-//            Object xbObj = map.get("xb");
-//            if (xbObj != null) {
-//                String s = xbObj.toString();
-//                if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) {
-//                    cphTeacher.setGender(xbObj.toString());
-//                }
-//            }
-//            Object zghObj = map.get("zgh");
-//            if (zghObj != null) {
-//                cphTeacher.setEmployeeId(zghObj.toString());
-//            }
-//            //学院id
-//            Object yxdmObj = map.get("yxdm");
-//            if (yxdmObj!=null) {
-//                Long deptId = cphTeacherMapper.selectDeptCode(yxdmObj.toString());
-//                if (deptId != null) {
-//                    cphTeacher.setDeptId(deptId);
-//                }
-//            }
-//            cphTeacher.setStatus("1");
-//            cphTeacher.setCreateTime(DateUtils.getNowDate());
-//            insertStudentList.add(cphTeacher);
-//        }
-//        if (insertStudentList.size()!=0) {
-//            cphTeacherMapper.insertBatchSomeColumn(insertStudentList);
-//        }
-//        //修改
-//        List<CphTeacher> updateSrsStudent = new ArrayList<>();
-//        for (Map map:updateMap){
-//            CphTeacher cphTeacher = new CphTeacher();
-//            Object xmObj = map.get("xm");
-//            if (xmObj != null) {
-//                cphTeacher.setName(xmObj.toString());
-//            }
-//            Object xbObj = map.get("xb");
-//            if (xbObj != null) {
-//                String s = xbObj.toString();
-//                if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) {
-//                    cphTeacher.setGender(xbObj.toString());
-//                }
-//            }
-//            Object zghObj = map.get("zgh");
-//            if (zghObj != null) {
-//                cphTeacher.setEmployeeId(zghObj.toString());
-//            }
-//            //学院id
-//            Object yxdmObj = map.get("yxdm");
-//            if (yxdmObj!=null) {
-//                Long ksh = cphTeacherMapper.selectDeptCode(yxdmObj.toString());
-//                if (ksh != null) {
-//                    cphTeacher.setDeptId(ksh);
-//                }
-//            }
-//            cphTeacher.setUpdateTime(DateUtils.getNowDate());
-//            updateSrsStudent.add(cphTeacher);
-//        }
-//        /*if (updateSrsStudent.size()!=0) {
-//            List<List<CphTeacher>> lists = ListSliceUtil.updateSlice(updateSrsStudent);
-//            if (lists != null) {
-//                for (List<CphTeacher> studentList : lists) {
-//                    cphTeacherMapper.updateSrsClassList(studentList);
-//                }
-//            }
-//        }*/
-//
-//
-//
-//    }
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void sqlserverSynchronousMYSQL(List<Map> list) {
+        //辅导员列表
+        List<CphTeacher> cphTeachers = cphTeacherMapper.selectTeacherList();
+        //查找重复值
+        List<Map> updateMap = list.stream()
+                .filter(obj1 -> cphTeachers
+                        .stream().anyMatch(obj2 -> {
+                            Object xhObj = obj1.get("zgh");
+                            if (xhObj != null) {
+                                String zgh = xhObj.toString();
+                                return obj2.getEmployeeId().equals(zgh);
+                            }
+                            return false;
+                        }))
+                .collect(Collectors.toList());
+
+        //添加需要
+        List<String> kshList2 = cphTeachers.stream()
+                .map(CphTeacher::getEmployeeId)
+                .collect(Collectors.toList());
+
+        List<Map> insertMap = list.stream()
+                .filter(obj -> {
+                    Object xhObj = obj.get("zgh");
+                    return xhObj != null && !kshList2.contains(xhObj.toString());
+                })
+                .collect(Collectors.toList());
+        //添加
+        List<CphTeacher> insertStudentList = new ArrayList<>();
+        for (Map map:insertMap){
+            CphTeacher cphTeacher = new CphTeacher();
+            Object xmObj = map.get("xm");
+            if (xmObj != null) {
+                cphTeacher.setName(xmObj.toString());
+            }
+            Object xbObj = map.get("xb");
+            if (xbObj != null) {
+                String s = xbObj.toString();
+                if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) {
+                    cphTeacher.setGender(xbObj.toString());
+                }
+            }
+            Object zghObj = map.get("zgh");
+            if (zghObj != null) {
+                cphTeacher.setEmployeeId(zghObj.toString());
+            }
+            //学院id
+            Object yxdmObj = map.get("yxdm");
+            if (yxdmObj!=null) {
+                Long deptId = cphTeacherMapper.selectDeptCode(yxdmObj.toString());
+                if (deptId != null) {
+                    cphTeacher.setDeptId(deptId);
+                }
+            }
+            cphTeacher.setStatus("1");
+            cphTeacher.setCreateTime(DateUtils.getNowDate());
+            insertStudentList.add(cphTeacher);
+        }
+        if (insertStudentList.size()!=0) {
+            cphTeacherMapper.insertBatchSomeColumn(insertStudentList);
+        }
+        //修改
+        List<CphTeacher> updateSrsStudent = new ArrayList<>();
+        for (Map map:updateMap){
+            CphTeacher cphTeacher = new CphTeacher();
+            Object xmObj = map.get("xm");
+            if (xmObj != null) {
+                cphTeacher.setName(xmObj.toString());
+            }
+            Object xbObj = map.get("xb");
+            if (xbObj != null) {
+                String s = xbObj.toString();
+                if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) {
+                    cphTeacher.setGender(xbObj.toString());
+                }
+            }
+            Object zghObj = map.get("zgh");
+            if (zghObj != null) {
+                cphTeacher.setEmployeeId(zghObj.toString());
+            }
+            //学院id
+            Object yxdmObj = map.get("yxdm");
+            if (yxdmObj!=null) {
+                Long ksh = cphTeacherMapper.selectDeptCode(yxdmObj.toString());
+                if (ksh != null) {
+                    cphTeacher.setDeptId(ksh);
+                }
+            }
+            cphTeacher.setUpdateTime(DateUtils.getNowDate());
+            updateSrsStudent.add(cphTeacher);
+        }
+        /*if (updateSrsStudent.size()!=0) {
+            List<List<CphTeacher>> lists = ListSliceUtil.updateSlice(updateSrsStudent);
+            if (lists != null) {
+                for (List<CphTeacher> studentList : lists) {
+                    cphTeacherMapper.updateSrsClassList(studentList);
+                }
+            }
+        }*/
+
+
+
+    }
 
     //同步教职工表
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void sqlserverSynchronousMYSQL(List<Map> list) {
+    public void synchronousMYSQL(List<Map> list) {
         List<QgzxTeacher> insertTeacherList = new ArrayList<>();//添加集合
         List<QgzxTeacher> updateTeacherList = new ArrayList<>();//修改集合
         for (Map<String, Object> map : list) {
@@ -501,64 +501,64 @@ public class CphTeacherServiceImpl implements ICphTeacherService
         }
     }
 
-//    //同步到用户表
-//    @Override
-//    @Transactional(rollbackFor = Exception.class)
-//    public void Usertb(){
-//        //同步到user表
-//        List<CphTeacher> cphTeachers = cphTeacherMapper.selectTeacherList();//所有职工
-//        List<SysUser> sysUserList = sysUserMapper.selectUserLisrS();//所以用户
-//        List<SysUser> insertUser = new ArrayList<>();//需要添加的集合
-//        List<SysUser> updateUser = new ArrayList<>();//需要修改的集合
-//        for (CphTeacher cphTeacher:cphTeachers){
-//            int i=0;//添加标记
-//            for (SysUser sysUser:sysUserList){
-//                //修改
-//                if (Objects.equals(cphTeacher.getEmployeeId(), sysUser.getUserName())){
-//                    SysUser sysUser1 = new SysUser();
-//                    sysUser1.setUserName(cphTeacher.getEmployeeId());
-//                    sysUser1.setDeptId(cphTeacher.getDeptId());
-//                    updateUser.add(sysUser1);
-//                    i=0;
-//                    break;
-//                }
-//                i=1;
-//            }
-//            //添加
-//            if (i==1){
-//                SysUser sysUser = new SysUser();
-//                sysUser.setUserName(cphTeacher.getEmployeeId());
-//                if (cphTeacher.getDeptId()!=null){
-//                    sysUser.setDeptId(cphTeacher.getDeptId());
-//                }
-//                sysUser.setSex(Objects.equals(cphTeacher.getGender(), "男") ?"0":"1");
-//                sysUser.setNickName(cphTeacher.getName());
-//                sysUser.setPassword(SecurityUtils.encryptPassword("#A"+cphTeacher.getEmployeeId()+"A#"));
-//                insertUser.add(sysUser);
-//
-//            }
-//            i=0;
-//        }
-//        if (insertUser.size()!=0){
-//            sysUserMapper.insertUserListInfo(insertUser);
-//            insertUserrole(insertUser);
-//        }
-//        if (updateUser.size()!=0) {
-//            List<List<SysUser>> listList1 = ListSliceUtil.updateSlice(updateUser);//切割修改集合
-//            if (listList1 != null) {
-//                for (List<SysUser> userList : listList1) {
-//                   // sysUserMapper.updateUserListInfo(userList);
-//                }
-//            }
-//        }
-//        System.out.println(insertUser.size());
-//        System.out.println(updateUser.size());
-//    }
-
     //同步到用户表
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void Usertb(){
+        //同步到user表
+        List<CphTeacher> cphTeachers = cphTeacherMapper.selectTeacherList();//所有职工
+        List<SysUser> sysUserList = sysUserMapper.selectUserLisrS();//所以用户
+        List<SysUser> insertUser = new ArrayList<>();//需要添加的集合
+        List<SysUser> updateUser = new ArrayList<>();//需要修改的集合
+        for (CphTeacher cphTeacher:cphTeachers){
+            int i=0;//添加标记
+            for (SysUser sysUser:sysUserList){
+                //修改
+                if (Objects.equals(cphTeacher.getEmployeeId(), sysUser.getUserName())){
+                    SysUser sysUser1 = new SysUser();
+                    sysUser1.setUserName(cphTeacher.getEmployeeId());
+                    sysUser1.setDeptId(cphTeacher.getDeptId());
+                    updateUser.add(sysUser1);
+                    i=0;
+                    break;
+                }
+                i=1;
+            }
+            //添加
+            if (i==1){
+                SysUser sysUser = new SysUser();
+                sysUser.setUserName(cphTeacher.getEmployeeId());
+                if (cphTeacher.getDeptId()!=null){
+                    sysUser.setDeptId(cphTeacher.getDeptId());
+                }
+                sysUser.setSex(Objects.equals(cphTeacher.getGender(), "男") ?"0":"1");
+                sysUser.setNickName(cphTeacher.getName());
+                sysUser.setPassword(SecurityUtils.encryptPassword("#A"+cphTeacher.getEmployeeId()+"A#"));
+                insertUser.add(sysUser);
+
+            }
+            i=0;
+        }
+        if (insertUser.size()!=0){
+            sysUserMapper.insertUserListInfo(insertUser);
+            insertUserrole(insertUser);
+        }
+        if (updateUser.size()!=0) {
+            List<List<SysUser>> listList1 = ListSliceUtil.updateSlice(updateUser);//切割修改集合
+            if (listList1 != null) {
+                for (List<SysUser> userList : listList1) {
+                   // sysUserMapper.updateUserListInfo(userList);
+                }
+            }
+        }
+        System.out.println(insertUser.size());
+        System.out.println(updateUser.size());
+    }
+
+    //同步到用户表
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void UsertbNew(){
         //同步到user表
         List<QgzxTeacher> qgzxTeachers = qgzxTeacherMapper.selectTeacherList();//所有职工
         List<SysUser> sysUserList = sysUserMapper.selectUserLisrS();//所以用户