|  | @@ -23,8 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 | 
											
												
													
														|  |          <result property="updateBy"     column="update_by"    />
 |  |          <result property="updateBy"     column="update_by"    />
 | 
											
												
													
														|  |          <result property="updateTime"   column="update_time"  />
 |  |          <result property="updateTime"   column="update_time"  />
 | 
											
												
													
														|  |          <result property="remark"       column="remark"       />
 |  |          <result property="remark"       column="remark"       />
 | 
											
												
													
														|  | -        <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
 |  | 
 | 
											
												
													
														|  | -        <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
 |  | 
 | 
											
												
													
														|  | 
 |  | +        <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
 | 
											
												
													
														|  | 
 |  | +        <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
 | 
											
												
													
														|  |      </resultMap>
 |  |      </resultMap>
 | 
											
												
													
														|  |  	
 |  |  	
 | 
											
												
													
														|  |      <resultMap id="deptResult" type="SysDept">
 |  |      <resultMap id="deptResult" type="SysDept">
 | 
											
										
											
												
													
														|  | @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 | 
											
												
													
														|  |          <result property="roleName"     column="role_name"      />
 |  |          <result property="roleName"     column="role_name"      />
 | 
											
												
													
														|  |          <result property="roleKey"      column="role_key"       />
 |  |          <result property="roleKey"      column="role_key"       />
 | 
											
												
													
														|  |          <result property="roleSort"     column="role_sort"      />
 |  |          <result property="roleSort"     column="role_sort"      />
 | 
											
												
													
														|  | -        <result property="dataScope"     column="data_scope"    />
 |  | 
 | 
											
												
													
														|  | 
 |  | +        <result property="dataScope"    column="data_scope"     />
 | 
											
												
													
														|  |          <result property="status"       column="role_status"    />
 |  |          <result property="status"       column="role_status"    />
 | 
											
												
													
														|  |      </resultMap>
 |  |      </resultMap>
 | 
											
												
													
														|  |  	
 |  |  	
 |