update

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

@@ -14,6 +14,9 @@ public class Organization {
 	/**  */
 	private Integer id;
 
+	/**  */
+	private Integer userId;
+
 	@ApiModelProperty(value = "合作单位名字",required = false)
 	private String name;
 
@@ -62,6 +65,14 @@ public class Organization {
 		this.name = name;
 	}
 
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
 	public YesOrNoEnum getIsAllowArrangeExam() {
 		return isAllowArrangeExam;
 	}

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

@@ -40,7 +40,6 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 	public void add(Employee employee) {
 		String tenantId = TenantContextHolder.getTenantId().toString();
 		SysUser sysUser = employee.getSysUser();
-		sysUser.setTenantId(tenantId);
 		employee.setTenantId(tenantId);
 		SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
 		if(user != null && user.getId() != null){
@@ -64,6 +63,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 			return;
 		}
 		user = new SysUser();
+		user.setTenantId(tenantId);
 		user.setPassword(new BCryptPasswordEncoder().encode("123456"));
 		user.setUserType("SYSTEM");
 		sysUserDao.insert(user);

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

@@ -71,7 +71,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				if(StringUtils.isEmpty(user.getPassword())){
 					sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
 				}
-				organ.setId(user.getId());
+				organ.setUserId(user.getId());
 				organDao.insert(organ);
 				//新增用户角色
 				if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
@@ -96,7 +96,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		sysUserDao.insert(sysUser);
 
 		organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + sysUser.getId());
-		organ.setId(sysUser.getId());
+		organ.setUserId(sysUser.getId());
 		organDao.insert(organ);
 		//新增用户角色
 		sysUserDao.delEmployeeRole(sysUser.getId());
@@ -112,11 +112,11 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	@Transactional(rollbackFor = Exception.class)
 	public void updateOrganization(Organization organization) {
 		SysUser sysUser = organization.getSysUser();
-		sysUser.setId(organization.getId());
+		sysUser.setId(organization.getUserId());
 		if(null == organDao.get(sysUser.getId())){
 			throw new BizException("合作商信息不存在");
 		}
-		organization.setId(sysUser.getId());
+//		organization.setId(sysUser.getId());
 		if(StringUtils.isNotEmpty(sysUser.getPhone())){
 			SysUser queryByPhone = sysUserDao.queryByPhone(sysUser.getPhone());
 			if(queryByPhone != null && !sysUser.getId().equals(queryByPhone.getId())){

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

@@ -8,6 +8,7 @@
 	
 	<resultMap type="com.keao.edu.user.entity.Organization" id="Organization">
 		<result column="id_" property="id" />
+		<result column="user_id_" property="userId" />
 		<result column="name_" property="name" />
 		<result column="contact_name_" property="contactName" />
 		<result column="contact_phone_" property="contactPhone" />
@@ -36,8 +37,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.Organization" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO organization (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_)
-		VALUES(#{id},#{name},#{contactName},#{contactPhone},#{level},#{parentOrganId},#{parentOrganIdTag},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+		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_)
+		VALUES(#{id},#{userId},#{name},#{contactName},#{contactPhone},#{level},#{parentOrganId},#{parentOrganIdTag},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 		#{shareProfitAmount},#{isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),#{tenantId})
 	</insert>
 	
@@ -78,6 +79,9 @@
 			<if test="tenantId != null">
 				tenant_id_ = #{tenantId},
 			</if>
+			<if test="userId != null">
+				user_id_ = #{userId},
+			</if>
 			update_time_ = NOW()
 		</set> WHERE id_ = #{id}
 	</update>