Merge branch 'master' of https://git.czcyedu.com/huoran/liuwanr

src/main/java/com/yipin/liuwanr/controller/StaffProfessionalArchitectureController.java

@@ -151,13 +151,13 @@ public class StaffProfessionalArchitectureController {
 	 * 	查询员工专业架构名称
 	 */
 	@GetMapping("/queryStaffPAN")
-	Response queryStaffPAN(@RequestParam String name) {
+	Response queryStaffPAN(@RequestParam("name") String name,@RequestParam("schoolId") Integer schoolId) {
 		Response resp = new Response();
 		if (name == null) {
 			resp.setStatus(300);
 			resp.setMessage("专业组织架构名称为空！");
 		}else {
-			HashMap<String, Object> ret = staffProfessionalArchitectureService.queryStaffPAN(name);
+			HashMap<String, Object> ret = staffProfessionalArchitectureService.queryStaffPAN(name,schoolId);
 			int status = (int) ret.get("retcode");
 			if (200 == status) {
 				resp.setStatus(status);

src/main/java/com/yipin/liuwanr/mapper/StaffProfessionalArchitectureMapper.java

@@ -2,10 +2,7 @@ package com.yipin.liuwanr.mapper;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Options;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.*;
 
 import com.yipin.liuwanr.entity.StaffProfessionalArchitecture;
 
@@ -21,8 +18,8 @@ public interface StaffProfessionalArchitectureMapper {
         "</script> "})
 	List<StaffProfessionalArchitecture> queryStaffProfessionalArchitecture(Integer schoolId);
 
-	@Select("SELECT staffProfessionalArchitectureId,staffProfessionalArchitectureName,schoolId from staff_professional_architecture where isdel = 0 and staffProfessionalArchitectureName = #{staffProfessionalArchitectureName}")
-	List<StaffProfessionalArchitecture> queryStaffPAN(String staffProfessionalArchitectureName);
+	@Select("SELECT staffProfessionalArchitectureId,staffProfessionalArchitectureName,schoolId from staff_professional_architecture where isdel = 0 and staffProfessionalArchitectureName = #{staffProfessionalArchitectureName} and schoolId=#{schoolId}")
+	List<StaffProfessionalArchitecture> queryStaffPAN(@Param("staffProfessionalArchitectureName") String staffProfessionalArchitectureName, @Param("schoolId") Integer schoolId);
 
 	
 	@Update("UPDATE staff_professional_architecture SET isdel = 1 where staffProfessionalArchitectureId = #{staffProfessionalArchitectureId}")

src/main/java/com/yipin/liuwanr/service/StaffProfessionalArchitectureService.java

@@ -69,10 +69,10 @@ public class StaffProfessionalArchitectureService {
 		return resp;
 	}
 
-	public HashMap<String, Object> queryStaffPAN(String name){
+	public HashMap<String, Object> queryStaffPAN(String name,Integer schoolId){
 		HashMap<String, Object> resp = new HashMap<String, Object>();
 		try {
-			resp.put("retvalue", staffProfessionalArchitectureMapper.queryStaffPAN(name));
+			resp.put("retvalue", staffProfessionalArchitectureMapper.queryStaffPAN(name,schoolId));
 			resp.put("retcode", 200);
 		} catch (RuntimeException e) {
 			logger.error(e.getMessage());