修改用户信息 角色

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -28,6 +28,7 @@ import com.huiju.estateagents.entity.SysMenu;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.service.ITaPersonBuildingService;
 import com.huiju.estateagents.service.ITaRoleService;
 import org.slf4j.Logger;
@@ -82,6 +83,9 @@ public class TaUserController extends BaseController {
     @Autowired
     private ITaUserRoleService taUserRoleService;
 
+    @Autowired
+    private TaRoleMapper taRoleMapper;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -238,6 +242,12 @@ public class TaUserController extends BaseController {
             //获取所有菜单
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null).getData();
             List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
+
+            allButtons.forEach(e -> {
+                List<TaRole> taRoles = taRoleMapper.getRolesByBtnId(e.getBtnId());
+                e.setRoles(taRoles);
+            });
+
             userMap.put("taUser", taUser);
             userMap.put("menuList", allMenus);
             userMap.put("buttonList", allButtons);

src/main/java/com/huiju/estateagents/entity/SysButtonInMenu.java

@@ -51,5 +51,5 @@ public class SysButtonInMenu implements Serializable {
     private String remark;
 
     @TableField(exist = false)
-    private List<Integer> roles;
+    private List<TaRole> roles;
 }

src/main/java/com/huiju/estateagents/mapper/TaRoleMapper.java

@@ -19,4 +19,11 @@ import java.util.List;
 public interface TaRoleMapper extends BaseMapper<TaRole> {
 
     List<TaRole> getRolesByUser(@Param("user") Integer userId);
+
+    /**
+     * 根据按钮ID查询出所有角色
+     * @param btnId
+     * @return
+     */
+    List<TaRole> getRolesByBtnId(@Param("btnId") Integer btnId);
 }

src/main/resources/mapper/TaRoleMapper.xml

@@ -10,4 +10,14 @@
         WHERE
             s.user_id = #{user}
     </select>
+
+    <select id="getRolesByBtnId" resultType="com.huiju.estateagents.entity.TaRole">
+        SELECT
+            t.*
+        FROM
+        ta_role_button trb left JOIN  ta_role t
+        ON trb.role_id = t.role_id
+        WHERE
+            trb.btn_id = #{btnId}
+    </select>
 </mapper>