udpate

edu-auth/edu-auth-api/src/main/java/com/keao/edu/auth/api/client/SysMessageFeignService.java

@@ -0,0 +1,10 @@
+package com.keao.edu.auth.api.client;
+
+import com.keao.edu.auth.api.client.fallback.SysMessageFeignServiceFallback;
+import com.keao.edu.common.config.FeignConfiguration;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(contextId = "SysMessageFeignService", name = "auth-server", configuration = { FeignConfiguration.class }, fallback = SysMessageFeignServiceFallback.class)
+public interface SysMessageFeignService {
+
+}

edu-auth/edu-auth-api/src/main/java/com/keao/edu/auth/api/client/fallback/SysMessageFeignServiceFallback.java

@@ -0,0 +1,9 @@
+package com.keao.edu.auth.api.client.fallback;
+
+import com.keao.edu.auth.api.client.SysMessageFeignService;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SysMessageFeignServiceFallback implements SysMessageFeignService {
+
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/TeacherController.java

@@ -55,7 +55,7 @@ public class TeacherController extends BaseController {
 	}
 
 	@ApiOperation(value = "删除教师")
-	@GetMapping(value = "del")
+	@PostMapping(value = "del")
     @PreAuthorize("@pcs.hasPermissions('teacher/del')")
 	public HttpResponseResult<Teacher> del(Integer id) {
 		teacherService.delete(id);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/OrganizationQueryInfo.java

@@ -8,6 +8,16 @@ public class OrganizationQueryInfo extends QueryInfo {
 
     private Integer parentId;
 
+    private Integer isAllowArrangeExam;
+
+    public Integer getIsAllowArrangeExam() {
+        return isAllowArrangeExam;
+    }
+
+    public void setIsAllowArrangeExam(Integer isAllowArrangeExam) {
+        this.isAllowArrangeExam = isAllowArrangeExam;
+    }
+
     public Integer getParentId() {
         return parentId;
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/TeacherServiceImpl.java

@@ -49,9 +49,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 		teacher.setTenantId(tenantId);
 		sysUser.setTenantId(tenantId);
 		if(user != null && user.getId() != null){
-			if(user.getUserType().contains("TEACHER")){
-				throw new BizException("此手机号已被占用");
-			}
 			Integer id = user.getId();
 			sysUser.setId(id);
 			Teacher teacher1 = teacherDao.get(id);

edu-user/edu-user-server/src/main/resources/config/mybatis/OrganizationMapper.xml

@@ -93,6 +93,9 @@
 			<if test="settlementType != null and settlementType != ''">
 				AND settlement_type_ = #{settlementType}
 			</if>
+			<if test="isAllowArrangeExam != null">
+				AND is_allow_arrange_exam_ = #{isAllowArrangeExam}
+			</if>
 			<if test="search != null and search != ''">
 				AND (id_ = #{search} OR name_ LIKE CONCAT('%',#{search},'%')
 				OR contact_name_ LIKE CONCAT('%',#{search},'%')

edu-user/edu-user-server/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -64,7 +64,7 @@
 	</insert>
 
 	<update id="delete">
-		UPDATE teacher SET del_flag_ = 1,update_time_ = NOW() WHERE id_ = #{id}
+		UPDATE teacher SET del_flag_ = 1,update_time_ = NOW() WHERE user_id_ = #{id}
 	</update>
 	<sql id="teacherQueryPage">
 		<where>
@@ -74,6 +74,9 @@
 				OR su.real_name_ LIKE CONCAT('%',#{search},'%')
 				OR su.phone_ LIKE CONCAT('%',#{search},'%'))
 			</if>
+			<if test="settlementType != null and settlementType != ''">
+				AND t.salary_settlement_type_ = #{settlementType}
+			</if>
 		</where>
 	</sql>
 	<!-- 分页查询 -->