From ebd2795d3826a23b032d2f33252a781acfb50570 Mon Sep 17 00:00:00 2001 From: mzh820631607 Date: Thu, 26 Nov 2020 18:38:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E5=92=8C=E7=99=BB=E5=BD=95=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/StaffProfessionalArchitectureMapper.java | 7 +++++++ src/main/java/com/yipin/liuwanr/mapper/UserInfoMapper.java | 2 +- .../service/StaffProfessionalArchitectureService.java | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yipin/liuwanr/mapper/StaffProfessionalArchitectureMapper.java b/src/main/java/com/yipin/liuwanr/mapper/StaffProfessionalArchitectureMapper.java index 3df3d3e..88f7d35 100644 --- a/src/main/java/com/yipin/liuwanr/mapper/StaffProfessionalArchitectureMapper.java +++ b/src/main/java/com/yipin/liuwanr/mapper/StaffProfessionalArchitectureMapper.java @@ -35,4 +35,11 @@ public interface StaffProfessionalArchitectureMapper { "SELECT pro.staffProfessionalArchitectureId,pro.staffProfessionalArchitectureName,pro.schoolId,sch.schoolName from staff_professional_architecture pro,school sch where pro.isdel = 0 and pro.schoolId = sch.schoolId and pro.schoolId = #{schoolId}", " "}) List queryAllStaffProfessionalArchitecture(Integer schoolId); + + @Update("UPDATE staff sta,\n" + + "staff_professional_architecture spa \n" + + "SET sta.staffProfessionalArchitectureName = spa.staffProfessionalArchitectureName \n" + + "WHERE\n" + + "\tsta.staffProfessionalArchitectureId = spa.staffProfessionalArchitectureId") + void updateStaffArchitectureName(); } \ No newline at end of file diff --git a/src/main/java/com/yipin/liuwanr/mapper/UserInfoMapper.java b/src/main/java/com/yipin/liuwanr/mapper/UserInfoMapper.java index 397525f..f3bc391 100644 --- a/src/main/java/com/yipin/liuwanr/mapper/UserInfoMapper.java +++ b/src/main/java/com/yipin/liuwanr/mapper/UserInfoMapper.java @@ -338,7 +338,7 @@ public interface UserInfoMapper { ""}) void deleteOrganizationRelationship(Integer userId); - @Select("SELECT disableAccount FROM hr_user_info WHERE schoolId = #{schoolId} AND account = #{account} and isdel = 0") + @Select("SELECT disableAccount FROM hr_user_info u LEFT JOIN student s ON u.userId = s.userId WHERE s.schoolId = #{schoolId} AND account = #{account} AND u.isdel = 0 AND s.isdel = 0") Integer queryDisableAccount(UserInfo userInfo); @Select("select roleId from hr_user_info where userId = #{userId}") diff --git a/src/main/java/com/yipin/liuwanr/service/StaffProfessionalArchitectureService.java b/src/main/java/com/yipin/liuwanr/service/StaffProfessionalArchitectureService.java index 7dc3231..03a3914 100644 --- a/src/main/java/com/yipin/liuwanr/service/StaffProfessionalArchitectureService.java +++ b/src/main/java/com/yipin/liuwanr/service/StaffProfessionalArchitectureService.java @@ -93,6 +93,7 @@ public class StaffProfessionalArchitectureService { HashMap resp = new HashMap(); try { staffProfessionalArchitectureMapper.updateStaffProfessionalArchitecture(staffProfessionalArchitecture); + staffProfessionalArchitectureMapper.updateStaffArchitectureName(); resp.put("retcode", 200); } catch (RuntimeException e) { logger.error(e.getMessage());