delete:合作单位去掉是否允许排考属性

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/Organization.java

@@ -41,9 +41,6 @@ public class Organization {
 
 	private String parentOrganIdTag;
 
-	@ApiModelProperty(value = "是否允许排考")
-	private Integer isAllowArrangeExam;
-	
 	/**  */
 	private java.util.Date createTime;
 	
@@ -81,14 +78,6 @@ public class Organization {
 		this.sysUser = sysUser;
 	}
 
-	public Integer getIsAllowArrangeExam() {
-		return isAllowArrangeExam;
-	}
-
-	public void setIsAllowArrangeExam(Integer isAllowArrangeExam) {
-		this.isAllowArrangeExam = isAllowArrangeExam;
-	}
-
 	public Integer getLevel() {
 		return level;
 	}

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

@@ -59,12 +59,6 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		if(currentOrganization.getLevel() == 3){
 			throw new BizException("无权限创建合作单位");
 		}
-		//获取父级的organ
-		if(organ.getIsAllowArrangeExam() == 1){
-			if(currentOrganization.getIsAllowArrangeExam() == 0){
-				throw new BizException("无权创建可排考的合作单位");
-			}
-		}
 		SysUser sysUser = organ.getSysUser();
 //		String tenantId = queryUserInfo.getTenantId();
 //		organ.setTenantId(tenantId);
@@ -168,12 +162,6 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		if(null == organization1){
 			throw new BizException("合作商信息不存在");
 		}
-		//获取父级的organ
-		if(organization.getIsAllowArrangeExam() == 1){
-			if(organization1.getIsAllowArrangeExam() == 0){
-				throw new BizException("无权创建可排考的合作单位");
-			}
-		}
 		sysUser.setId(organization1.getUserId());
 //		organization.setId(sysUser.getId());
 		if(StringUtils.isNotEmpty(sysUser.getPhone())){

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

@@ -82,7 +82,6 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 		organ.setName(tenantInfo.getName());
 		organ.setContactName(tenantInfo.getContactName());
 		organ.setContactPhone(tenantInfo.getContactPhone());
-		organ.setIsAllowArrangeExam(1);
 		organizationDao.insert(organ);
 
 		Employee employee = new Employee();

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

@@ -18,7 +18,6 @@
 		<result column="settlement_type_" property="settlementType" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
 		<result column="del_flag_" property="delFlag" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
 		<result column="share_profit_amount_" property="shareProfitAmount" />
-		<result column="is_allow_arrange_exam_" property="isAllowArrangeExam" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
@@ -27,7 +26,7 @@
 	<sql id="organizationColumn">
 		o.id_ organization_id_, o.user_id_, o.name_, o.contact_name_, o.contact_phone_,
 		o.settlement_type_, o.share_profit_amount_, o.level_, o.parent_organ_id_,
-		o.parent_organ_id_tag_, o.is_allow_arrange_exam_, o.create_time_,
+		o.parent_organ_id_tag_, o.create_time_,
 		o.update_time_, o.del_flag_, o.tenant_id_
 	</sql>
 	
@@ -46,9 +45,9 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.Organization" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO organization (id_,user_id_,name_,contact_name_,contact_phone_,level_,parent_organ_id_,parent_organ_id_tag_,settlement_type_,share_profit_amount_,is_allow_arrange_exam_,create_time_,update_time_,tenant_id_)
+		INSERT INTO organization (id_,user_id_,name_,contact_name_,contact_phone_,level_,parent_organ_id_,parent_organ_id_tag_,settlement_type_,share_profit_amount_,create_time_,update_time_,tenant_id_)
 		VALUES(#{id},#{userId},#{name},#{contactName},#{contactPhone},#{level},#{parentOrganId},#{parentOrganIdTag},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
-		#{shareProfitAmount},#{isAllowArrangeExam},NOW(),NOW(),#{tenantId})
+		#{shareProfitAmount},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -79,9 +78,6 @@
 			<if test="name != null">
 				name_ = #{name},
 			</if>
-			<if test="isAllowArrangeExam != null">
-				is_allow_arrange_exam_ = #{isAllowArrangeExam},
-			</if>
 			<if test="delFlag != null">
 				del_flag_ = #{delFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 			</if>
@@ -118,9 +114,6 @@
 					#{organId}
 				</foreach>
 			</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},'%')