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 e43ae21..e93026e 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
@@ -157,7 +157,7 @@ public class CphSqlServerDataController extends BaseController {
     public AjaxResult synchronousEmployEEInfoList(){
         //startPage();
         List<Map> list=sqlServerDataService.getEmployEEInfoList();
-        iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工
+        iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步辅导员
         iCphTeacherService.Usertb();
         return success();
     }
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 a4f7b63..9f7fb62 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
@@ -4,6 +4,7 @@ import com.srs.common.core.controller.BaseController;
 import com.srs.common.core.domain.AjaxResult;
 import com.srs.common.core.page.TableDataInfo;
 import com.srs.comprehensive.service.ICphTeacherService;
+import com.srs.comprehensive.service.ISrsMajorsService;
 import com.srs.comprehensive.service.SyncDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,6 +22,7 @@ public class SyncDataController extends BaseController {
     SyncDataService syncDataService;
     @Autowired
     ICphTeacherService iCphTeacherService;
+    ISrsMajorsService iSrsMajorsService;
     @RequestMapping("/getEmployEEInfoList")
     public TableDataInfo getEmployEEInfoList(){
         startPage();
@@ -35,11 +37,18 @@ public class SyncDataController extends BaseController {
         iCphTeacherService.UsertbNew();
         return success();
     }
-    //专业
+    //中间表专业信息
     @RequestMapping("/getSpecialtyInfoList")
     public TableDataInfo getSpecialtyInfoList(String zydm){
         startPage();
         List<Map> list=syncDataService.getSpecialtyInfoList(zydm);
         return getDataTable(list);
     }
+    //同步专业
+    @RequestMapping("/synchronousSpecialtyInfoList")
+    public AjaxResult synchronousSpecialtyInfoList(){
+        List<Map> list=syncDataService.getSpecialtyALLInfo();
+        //iSrsMajorsService.synchronousMYSQL(list);//同步专业
+        return success();
+    }
 }
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java
index 86ec885..d7d20c8 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java
@@ -6,4 +6,5 @@ import java.util.Map;
 public interface SyncDataMapper {
    public List<Map> getEmployEEInfoList();//教职工
    public List<Map>  getSpecialtyInfoList(String zydm);//专业
+   public  List<Map> getSpecialtyALLInfo();//所有专业
 }
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java
index 8d157c8..a552610 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java
@@ -68,6 +68,7 @@ public interface ISrsMajorsService
     public Map<String,Object> dataSync();
 
     void sqlserverSynchronousMYSQL(List<Map> list);
+    void synchronousMYSQL(List<Map> list);
     //根据专业名称获取专业id
     public Long getMajorIdByName(String name);
     //获取学生的专业名称
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java
index 5c97eda..3a433bf 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java
@@ -6,5 +6,5 @@ import java.util.Map;
 public interface SyncDataService {
     List<Map> getEmployEEInfoList();//教职工
     List<Map> getSpecialtyInfoList(String zydm);//专业
-
+    List<Map> getSpecialtyALLInfo();//所有专业
 }
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 c5dc26c..80c6286 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
@@ -611,7 +611,7 @@ public class CphTeacherServiceImpl implements ICphTeacherService
         }
         if (insertUser.size()!=0){
             sysUserMapper.insertUserListInfo(insertUser);
-            insertUserrole(insertUser);
+            insertUserroleNew(insertUser);
         }
         if (updateUser.size()!=0) {
             List<List<SysUser>> listList1 = ListSliceUtil.updateSlice(updateUser);//切割修改集合
@@ -636,6 +636,16 @@ public class CphTeacherServiceImpl implements ICphTeacherService
         }
         sysUserRoleMapper.batchUserRole(userRoleList);
     }
+    public void insertUserroleNew(List<SysUser> insertUser){
+        List<SysUserRole> userRoleList=new ArrayList<>();
+        for (SysUser sysUser:insertUser){
+            SysUserRole sysRole = new SysUserRole();
+            sysRole.setUserId(sysUser.getUserId());
+            sysRole.setRoleId(124L);//统一设为教职工角色
+            userRoleList.add(sysRole);
+        }
+        sysUserRoleMapper.batchUserRole(userRoleList);
+    }
 
     @Override
     public List<Map<String, Object>> exportSXZZ(CphExport param) {
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java
index 81ae353..a4f9871 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java
@@ -251,4 +251,102 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService
         }
     }
 
+    //同步专业
+    @Override
+    public void synchronousMYSQL(List<Map> list) {
+        List<SrsMajors> srsMajors = srsMajorsMapper.selectSrsmajorsList();//数据库存在的专业列表
+        //查找重复值
+        List<Map> updateMap = list.stream()
+                .filter(obj1 -> srsMajors
+                        .stream().anyMatch(obj2 -> {
+                            Object xhObj = obj1.get("zydm");
+                            if (xhObj != null) {
+                                String xh = xhObj.toString();
+                                return obj2.getMajorCode().equals(xh);
+                            }
+                            return false;
+                        }))
+                .collect(Collectors.toList());
+
+        //添加需要
+        List<String> kshList2 = srsMajors.stream()
+                .map(SrsMajors::getMajorCode)
+                .collect(Collectors.toList());
+
+        List<Map> insertMap = list.stream()
+                .filter(obj -> {
+                    Object xhObj = obj.get("zydm");
+                    return xhObj != null && !kshList2.contains(xhObj.toString());
+                })
+                .collect(Collectors.toList());
+        //添加
+        List<SrsMajors> insertStudentList = new ArrayList<>();
+        for (Map map:insertMap){
+            SrsMajors srsMajors1 = new SrsMajors();
+            Object zydmobj=map.get("zydm");
+            if (zydmobj!=null) {
+                srsMajors1.setMajorCode(zydmobj.toString());
+            }
+            Object zymcobj=map.get("zymc");
+            if (zymcobj!=null) {
+                srsMajors1.setMajorName(zymcobj.toString());
+            }
+            srsMajors1.setStatus("0");
+
+            if (map.get("yxmc")!=null) {
+                //使用代码查询学院id
+                    Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString());
+                    if (yxdm != null) {
+                        srsMajors1.setCollegeId(yxdm);//学院id
+                    } else {
+                        srsMajors1.setCollegeId(0L);
+                    }
+            }else {
+                srsMajors1.setCollegeId(0L);
+            }
+            srsMajors1.setCreateTime(DateUtils.getNowDate());
+            insertStudentList.add(srsMajors1);
+        }
+        //修改
+        List<SrsMajors> updateSrsStudent = new ArrayList<>();
+        for (Map map:updateMap){
+            SrsMajors srsMajors1 = new SrsMajors();
+            Object zydmobj=map.get("zydm");
+            if (zydmobj!=null) {
+                srsMajors1.setMajorCode(zydmobj.toString());
+            }
+            Object zymcobj=map.get("zymc");
+            if (zymcobj!=null) {
+                srsMajors1.setMajorName(zymcobj.toString());
+            }
+
+            if (map.get("yxmc")!=null) {
+                    //使用代码查询学院id
+                    Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString());
+                    if (yxdm != null) {
+                        srsMajors1.setCollegeId(yxdm);//学院id
+                    } else {
+                        srsMajors1.setCollegeId(0L);
+                    }
+            }else {
+                srsMajors1.setCollegeId(0L);
+            }
+            srsMajors1.setUpdateTime(DateUtils.getNowDate());
+            updateSrsStudent.add(srsMajors1);
+        }
+        if (insertStudentList.size()!=0) {
+            srsMajorsMapper.insertBatchSomeColumn(insertStudentList);
+        }
+        if(updateSrsStudent.size()!=0) {
+            List<List<SrsMajors>> lists = ListSliceUtil.updateSlice(updateSrsStudent);
+            if (lists != null) {
+                for (List<SrsMajors> studentList : lists) {
+                    srsMajorsMapper.updateSrsStudentList(studentList);
+                }
+            }
+        }
+        System.out.println(insertStudentList.size());
+        System.out.println(updateSrsStudent.size());
+    }
+
 }
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java
index 7e4cc15..fce4a0a 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java
@@ -22,5 +22,9 @@ public class SyncDataServiceImpl implements SyncDataService {
     public List<Map> getSpecialtyInfoList(String zydm) {
         return syncDataMapper.getSpecialtyInfoList(zydm);
     }
+    @Override
+    public  List<Map> getSpecialtyALLInfo(){
+        return syncDataMapper.getSpecialtyALLInfo();
+    }
 
 }
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml
index d0002f1..64205f1 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml
@@ -18,4 +18,8 @@
             <if test="zydm != null and zydm!= '' ">and b.JXZYBH=#{zydm}</if>
         </where>
         </select>
+    <select id="getSpecialtyALLInfo" resultType="java.util.Map">
+        select  b.JXZYBH as zydm,b.JXZYJC as zyjc,b.JXZYMC as zymc,a.BMMC yxmc from from_gxsdxyxxzx_xzbm a left  join from_gxsdxyxxzx_zyxx b on a.BMBH=b.JXZYSSYXBBH
+        where  b.JXZYBH is not null
+    </select>
 </mapper>