修改教师个人信息汇总

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java

@@ -1331,7 +1331,8 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
         comperhensiveVo.setSchoolGkAchievement(schoolGkAchievementVos);
         comperhensiveVo.setSchoolGkAchievement(schoolGkAchievementVos);
          // *4.2 教学成绩
          // *4.2 教学成绩
         SchoolXteachingAchievementsVo schoolXteachingAchievementsVo = new SchoolXteachingAchievementsVo();
         SchoolXteachingAchievementsVo schoolXteachingAchievementsVo = new SchoolXteachingAchievementsVo();
-        schoolXteachingAchievementsVo.setUserId(sysUser.getUserId());
+//        schoolXteachingAchievementsVo.setUserId(sysUser.getUserId());
+        schoolXteachingAchievementsVo.setIdCard(req.getIdCard());
         List<SchoolXteachingAchievementsVo> schoolXteachingAchievementsVos = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
         List<SchoolXteachingAchievementsVo> schoolXteachingAchievementsVos = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
         comperhensiveVo.setSchoolXteachingAchievements(schoolXteachingAchievementsVos);
         comperhensiveVo.setSchoolXteachingAchievements(schoolXteachingAchievementsVos);
         List<SpecialityVo> specialityVos = new ArrayList<>();
         List<SpecialityVo> specialityVos = new ArrayList<>();

smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/schoolOffcial/WxOfficialFlowController.java

@@ -102,12 +102,15 @@ public class WxOfficialFlowController extends BaseController {
      */
      */
     @PutMapping("/initiator/{id}")
     @PutMapping("/initiator/{id}")
     public AjaxResult initiator(@PathVariable Long id, @RequestBody UserIdVo vo) {
     public AjaxResult initiator(@PathVariable Long id, @RequestBody UserIdVo vo) {
-        if (StringUtils.isNotNull(vo.getUserId()) && StringUtils.isNotNull(vo.getUserIds()) && vo.getUserIds().length != 0) {
+        if (StringUtils.isNotNull(vo.getUserId()) && StringUtils.isNotNull(vo.getUserIds())) {
             return AjaxResult.error("批阅人和传阅人两者只能传一个");
             return AjaxResult.error("批阅人和传阅人两者只能传一个");
         }
         }
         if (StringUtils.isNull(vo.getUserId()) && StringUtils.isNull(vo.getUserIds())) {
         if (StringUtils.isNull(vo.getUserId()) && StringUtils.isNull(vo.getUserIds())) {
             return AjaxResult.error("批阅人和传阅人两者必须传一个");
             return AjaxResult.error("批阅人和传阅人两者必须传一个");
         }
         }
+        if (StringUtils.isNotNull(vo.getUserId()) && vo.getUserIds().length != 0){
+            return AjaxResult.error("批阅人和传阅人两者只能传一个");
+        }
         if (StringUtils.isNull(vo.getUserId()) && vo.getUserIds().length == 0){
         if (StringUtils.isNull(vo.getUserId()) && vo.getUserIds().length == 0){
             return AjaxResult.error("批阅人和传阅人两者必须传一个");
             return AjaxResult.error("批阅人和传阅人两者必须传一个");
         }
         }