feats

src/main/java/com/yunzhi/nanyang/controller/SysRolePermissionController.java

@@ -55,12 +55,12 @@ public class SysRolePermissionController extends BaseController {
      */
     @RequestMapping(value="/admin/role-permission",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysRolePermissionList(@ApiParam("角色ID") @RequestParam(value ="roleId", required = false) String roleId) throws Exception{
+    public ResponseBean sysRolePermissionList(@ApiParam("角色ID") @RequestParam(value ="roleId") String roleId) throws Exception{
 
-        String userId = currentUser().getUserId();
-        boolean isAdmin = userId.equals(Constants.ADMIN_ID);
+//        String userId = currentUser().getUserId();
+//        boolean isAdmin = userId.equals(Constants.ADMIN_ID);
 
-        List<SysRolePermission> result = iSysRolePermissionService.listBy(isAdmin, userId, roleId);
+        List<SysRolePermission> result = iSysRolePermissionService.listBy(roleId);
         return ResponseBean.success(result);
     }
 
@@ -69,33 +69,36 @@ public class SysRolePermissionController extends BaseController {
      * @param sysRolePermission 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/role-permission",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/role/{roleId}/permission",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     @RequiresPermissions("role:add")
-    public ResponseBean sysRolePermissionAdd(@ApiParam("保存内容") @RequestBody SysRolePermission sysRolePermission) throws Exception{
+    public ResponseBean sysRolePermissionAdd(@ApiParam("角色ID") @PathVariable String roleId,
+                                             @ApiParam("保存内容") @RequestBody List<SysRolePermission> sysRolePermissionList) throws Exception{
 
-        String roleId = sysRolePermission.getRoleId();
-        String permissionId = sysRolePermission.getPermissionId();
-
-        if (StringUtils.isEmpty(roleId) || StringUtils.isEmpty(permissionId)) {
+        if (sysRolePermissionList.isEmpty()) {
             return ResponseBean.error("授权内容不能为空");
         }
 
-        Map<String, Object> params = new HashMap<>();
-        params.put("role_id", roleId);
-        params.put("permission_id", permissionId);
+        // 判断是否有角色操作权限
+        // todo
 
-        Collection<SysRolePermission> exits = iSysRolePermissionService.listByMap(params);
-        if (exits != null && exits.size() > 0) {
-            return ResponseBean.error("重复授权");
-        }
+        for (SysRolePermission item : sysRolePermissionList) {
+            item.setSerialNo(null);
+            item.setRoleId(roleId);
 
-        if (!checkAccess(currentUser().getUserId(), roleId, permissionId)) {
-            return ResponseBean.error("无权限进行此操作");
+            String permissionId = item.getPermissionId();
+            if (StringUtils.isEmpty(roleId) || StringUtils.isEmpty(permissionId)) {
+                return ResponseBean.error("存在授权空内容");
+            }
         }
 
-        if (iSysRolePermissionService.save(sysRolePermission)){
-            return ResponseBean.success(sysRolePermission);
+        // 先删除原来的
+        Map<String, Object> params = new HashMap<>();
+        params.put("role_id", roleId);
+        iSysRolePermissionService.removeByMap(params);
+
+        if (iSysRolePermissionService.saveBatch(sysRolePermissionList)){
+            return ResponseBean.success(sysRolePermissionList);
         } else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }

src/main/java/com/yunzhi/nanyang/controller/SysUserController.java

@@ -73,7 +73,7 @@ public class SysUserController extends BaseController {
 
         IPage<SysUser> pg = new Page<>(pageNum, pageSize);
 
-        IPage<SysUser> result = iSysUserService.getPageBy(pg, isAdmin, userId, orgId, name, phone);
+        IPage<SysUser> result = iSysUserService.getPageBy(pg, userId, orgId, name, phone);
         return ResponseBean.success(result);
     }
 
@@ -86,7 +86,9 @@ public class SysUserController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     @RequiresPermissions("user:add")
     public ResponseBean sysUserAdd(@ApiParam("保存内容") @RequestBody SysUser sysUser) throws Exception{
+        String userId = currentUser().getUserId();
         sysUser.setUserId(null);
+        sysUser.setCreateUser(userId);
 
         if (StringUtils.isEmpty(sysUser.getUserName()) || StringUtils.isEmpty(sysUser.getPhone())) {
             return ResponseBean.error("姓名或者手机不能为空");
@@ -101,11 +103,6 @@ public class SysUserController extends BaseController {
             return ResponseBean.error("手机号码重复");
         }
 
-        boolean canAccess = iSysUserService.canAccessData(sysUser.getOrgId(), currentUser().getUserId());
-        if (!canAccess) {
-            return ResponseBean.error("无机构操作权限");
-        }
-
         if (!StringUtils.isEmpty(sysUser.getLoginName())) {
             int cnt = iSysLoginService.countBy("login_name", sysUser.getLoginName(), true);
             if (cnt > 0) {
@@ -168,8 +165,10 @@ public class SysUserController extends BaseController {
     @RequiresPermissions("user:update")
     public ResponseBean sysUserUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody SysUser sysUser) throws Exception{
-
+        String userId = currentUser().getUserId();
         sysUser.setUserId(id);
+        // 不支持更新创建人
+        sysUser.setCreateUser(null);
 
         if (StringUtils.isEmpty(sysUser.getUserName()) || StringUtils.isEmpty(sysUser.getPhone())) {
             return ResponseBean.error("姓名或者手机不能为空");
@@ -184,7 +183,7 @@ public class SysUserController extends BaseController {
             return ResponseBean.error("手机号码重复");
         }
 
-        boolean canAccess = iSysUserService.canAccessData(sysUser.getOrgId(), currentUser().getUserId());
+        boolean canAccess = iSysUserService.canAccessData(sysUser.getOrgId(), userId);
         if (!canAccess) {
             return ResponseBean.error("无机构操作权限");
         }

src/main/java/com/yunzhi/nanyang/controller/SysUserRoleController.java

@@ -27,6 +27,7 @@ import com.yunzhi.nanyang.service.ISysUserRoleService;
 import com.yunzhi.nanyang.entity.SysUserRole;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -61,14 +62,9 @@ public class SysUserRoleController extends BaseController {
      */
     @RequestMapping(value="/admin/user-role",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    @RequiresPermissions("role:view,user:view")
     public ResponseBean sysUserRoleList(@ApiParam("用户ID") @RequestParam(value ="user_id") String userId) throws Exception{
 
-        QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_id", userId);
-        queryWrapper.orderByDesc("role_id");
-
-        List<SysUserRole> result = iSysUserRoleService.list(queryWrapper);
+        List<SysUserRole> result = iSysUserRoleService.listByUser(userId);
         return ResponseBean.success(result);
     }
 
@@ -77,45 +73,55 @@ public class SysUserRoleController extends BaseController {
      * @param sysUserRole 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/user-role",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/user/{userId}/role",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     @RequiresPermissions("user:add")
-    public ResponseBean sysUserRoleAdd(@ApiParam("保存内容") @RequestBody SysUserRole sysUserRole) throws Exception{
-
-        String userId = sysUserRole.getUserId();
-        String roleId = sysUserRole.getRoleId();
-
-        if (StringUtils.isEmpty(roleId) || StringUtils.isEmpty(userId)) {
-            return ResponseBean.error("用户或者角色不能为空");
+    public ResponseBean sysUserRoleAdd(@ApiParam("用户ID") @PathVariable String userId,
+                                       @ApiParam("保存内容") @RequestBody List<SysUserRole> sysUserRoleList) throws Exception{
+        // 不能编辑管理员权限
+        if (Constants.ADMIN_ID.equals(userId)) {
+            return ResponseBean.error("无操作权限");
         }
-
-        if (userId.equals(Constants.ADMIN_ID)) {
-            return ResponseBean.error("无权进行当前操作");
-        }
-
+        //
         SysUser sysUser = iSysUserService.getExistBy("user_id", userId, false,true);
         if (sysUser == null) {
             return ResponseBean.error("用户不存在");
         }
 
-        SysRole sysRole = iSysRoleService.getById(roleId);
-        if (sysRole == null) {
-            return ResponseBean.error("角色不存在");
+        // 操作员与待授权人员必须同属一个机构
+        String currentUserId = currentUser().getUserId();
+        if (!iSysUserService.canAccessData(sysUser.getOrgId(), currentUserId)) {
+            return ResponseBean.error("无操作权限");
         }
 
-        boolean canAccess = iSysUserService.canAccessData(userId, currentUser().getUserId());
-        if (!canAccess) {
-            return ResponseBean.error("无权进行当前操作");
+        if (sysUserRoleList.isEmpty()) {
+            return ResponseBean.error("未找到授权内容");
         }
 
-        SysUserRole origin = iSysUserRoleService.checkExist(sysUserRole.getRoleId(), userId);
-        if (origin != null) {
-            return ResponseBean.success(origin);
+        for (SysUserRole sysUserRole : sysUserRoleList) {
+
+            String roleId = sysUserRole.getRoleId();
+            if (StringUtils.isEmpty(roleId) || StringUtils.isEmpty(userId)) {
+                return ResponseBean.error("用户或者角色不能为空");
+            }
+
+            SysRole sysRole = iSysRoleService.getById(roleId);
+            if (sysRole == null) {
+                return ResponseBean.error("角色不存在");
+            }
+
+            if (iSysUserRoleService.checkExist(roleId, currentUserId) == null) {
+                return ResponseBean.error("无操作权限");
+            }
         }
 
-        sysUserRole.setSerialNo(null);
-        if (iSysUserRoleService.save(sysUserRole)){
-            return ResponseBean.success(sysUserRole);
+        // 先删除所有
+        iSysUserRoleService.removeByMap(new HashMap<String, Object>(){{
+            put("user_id", userId);
+        }});
+
+        if (iSysUserRoleService.saveBatch(sysUserRoleList)){
+            return ResponseBean.success(sysUserRoleList);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -125,31 +131,31 @@ public class SysUserRoleController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/user-role/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/user/{userId}/role", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
     @RequiresPermissions("user:delete")
-    public ResponseBean sysUserRoleDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        SysUserRole sysUserRole = iSysUserRoleService.getById(id);
-        if (null == sysUserRole) {
-            return ResponseBean.success("success");
+    public ResponseBean sysUserRoleDelete(@ApiParam("对象ID") @PathVariable String userId) throws Exception{
+        // 不能编辑管理员权限
+        if (Constants.ADMIN_ID.equals(userId)) {
+            return ResponseBean.error("无操作权限");
         }
-
-        String userId = sysUserRole.getUserId();
+        //
         SysUser sysUser = iSysUserService.getExistBy("user_id", userId, false,true);
         if (sysUser == null) {
             return ResponseBean.error("用户不存在");
         }
 
-        boolean canAccess = iSysUserService.canAccessData(userId, currentUser().getUserId());
-        if (!canAccess) {
-            return ResponseBean.error("无权进行当前操作");
+        // 操作员与待授权人员必须同属一个机构
+        String currentUserId = currentUser().getUserId();
+        if (!iSysUserService.canAccessData(sysUser.getOrgId(), currentUserId)) {
+            return ResponseBean.error("无操作权限");
         }
 
-        if(iSysUserRoleService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
+        iSysUserRoleService.removeByMap(new HashMap<String, Object>(){{
+            put("user_id", userId);
+        }});
+
+        return ResponseBean.success("success");
     }
 
 }

src/main/java/com/yunzhi/nanyang/controller/TaNewsTypeController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.ResponseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -46,17 +47,18 @@ public class TaNewsTypeController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taNewsType",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/news-type",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taNewsTypeList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
-		    IPage<TaNewsType> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaNewsType> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaNewsType> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaNewsType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<TaNewsType> result = iTaNewsTypeService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaNewsType> result = iTaNewsTypeService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**

src/main/java/com/yunzhi/nanyang/entity/SysUser.java

@@ -29,7 +29,7 @@ public class SysUser implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "用户Id")
-    @TableId(value = "user_id", type = IdType.INPUT)
+    @TableId(value = "user_id", type = IdType.UUID)
     private String userId;
 
     @ApiModelProperty(value = "用户名")
@@ -53,6 +53,9 @@ public class SysUser implements Serializable {
     @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "机构ID")
+    private String createUser;
+
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 

src/main/java/com/yunzhi/nanyang/entity/SysUserRole.java

@@ -1,6 +1,7 @@
 package com.yunzhi.nanyang.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -35,5 +36,8 @@ public class SysUserRole implements Serializable {
     @ApiModelProperty(value = "角色ID")
     private String roleId;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "角色名称")
+    private String roleName;
 
 }

src/main/java/com/yunzhi/nanyang/mapper/SysRolePermissionMapper.java

@@ -22,9 +22,7 @@ public interface SysRolePermissionMapper extends BaseMapper<SysRolePermission> {
     Set<String> getPermissionByUser(@Param("isAdmin") boolean isAdmin,
                                     @Param("userId") String userId);
 
-    List<SysRolePermission> listBy(@Param("isAdmin") boolean isAdmin,
-                                   @Param("userId") String userId,
-                                   @Param("roleId") String roleId);
+    List<SysRolePermission> listBy(@Param("roleId") String roleId);
 
     int countBy(@Param("userId") String userId,
                     @Param("roleId") String roleId,

src/main/java/com/yunzhi/nanyang/mapper/SysUserMapper.java

@@ -20,7 +20,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     SysUser getByLoginId(@Param("loginId") String loginId);
 
     IPage<SysUser> getPageBy(IPage<SysUser> pg,
-                             @Param("isAdmin") boolean isAdmin,
+                             @Param("adminId") String adminId,
                              @Param("userId") String userId,
                              @Param("orgId") String orgId,
                              @Param("name") String name,

src/main/java/com/yunzhi/nanyang/mapper/SysUserRoleMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -19,4 +20,6 @@ import java.util.Set;
 public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
 
     Set<String> getRoleByUser(@Param("userId") String userId);
+
+    List<SysUserRole> listByUser(@Param("userId") String userId);
 }

src/main/java/com/yunzhi/nanyang/service/ISysRolePermissionService.java

@@ -1,7 +1,6 @@
 package com.yunzhi.nanyang.service;
 
 import com.yunzhi.nanyang.entity.SysRolePermission;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -15,7 +14,7 @@ import java.util.List;
  */
 public interface ISysRolePermissionService extends IBaseService<SysRolePermission> {
 
-    List<SysRolePermission> listBy(boolean isAdmin, String userId, String roleId);
+    List<SysRolePermission> listBy(String roleId);
 
     boolean checkAccess(String userId, String roleId, String permissionId);
 }

src/main/java/com/yunzhi/nanyang/service/ISysUserRoleService.java

@@ -3,6 +3,8 @@ package com.yunzhi.nanyang.service;
 import com.yunzhi.nanyang.entity.SysUserRole;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户角色 服务类
@@ -14,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ISysUserRoleService extends IBaseService<SysUserRole> {
 
     SysUserRole checkExist(String roleId, String userId);
+
+    List<SysUserRole> listByUser(String userId);
 }

src/main/java/com/yunzhi/nanyang/service/ISysUserService.java

@@ -19,5 +19,5 @@ public interface ISysUserService extends IBaseService<SysUser> {
 
     SysUser getByLoginId(String loginId);
 
-    IPage<SysUser> getPageBy(IPage<SysUser> pg, boolean isAdmin, String userId, String orgId, String name, String phone);
+    IPage<SysUser> getPageBy(IPage<SysUser> pg, String userId, String orgId, String name, String phone);
 }

src/main/java/com/yunzhi/nanyang/service/impl/BaseServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.service.IBaseService;
 
 import java.io.Serializable;
@@ -38,11 +39,13 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,
 
     @Override
     public boolean canAccessData(Serializable id, String userId) {
+        if (Constants.ADMIN_ID.equals(userId)) return true;
+
         TableInfo tableInfo = SqlHelper.table(currentModelClass());
 
         String t = tableInfo.getTableName();
-        String k = tableInfo.getKeyColumn();
-        String kAlias = t + "." + k;
+//        String k = tableInfo.getKeyColumn();
+        String kAlias = t + ".org_id";
 
         String joinSQL = "INNER JOIN sys_user_data_scope s ON ( "+ kAlias +" = s.org_id OR "+t+".create_user = s.user_id )";
         String whereSQL = "WHERE " + kAlias + " = '"+ id +"' AND s.user_id = '" + userId + "'";

src/main/java/com/yunzhi/nanyang/service/impl/SysRolePermissionServiceImpl.java

@@ -3,7 +3,6 @@ package com.yunzhi.nanyang.service.impl;
 import com.yunzhi.nanyang.entity.SysRolePermission;
 import com.yunzhi.nanyang.mapper.SysRolePermissionMapper;
 import com.yunzhi.nanyang.service.ISysRolePermissionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,8 +19,8 @@ import java.util.List;
 public class SysRolePermissionServiceImpl extends BaseServiceImpl<SysRolePermissionMapper, SysRolePermission> implements ISysRolePermissionService {
 
     @Override
-    public List<SysRolePermission> listBy(boolean isAdmin, String userId, String roleId) {
-        return baseMapper.listBy(isAdmin, userId, roleId);
+    public List<SysRolePermission> listBy(String roleId) {
+        return baseMapper.listBy(roleId);
     }
 
     @Override

src/main/java/com/yunzhi/nanyang/service/impl/SysUserRoleServiceImpl.java

@@ -1,12 +1,16 @@
 package com.yunzhi.nanyang.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.entity.SysUserRole;
 import com.yunzhi.nanyang.mapper.SysUserRoleMapper;
 import com.yunzhi.nanyang.service.ISysUserRoleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.tomcat.util.bcel.Const;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户角色 服务实现类
@@ -20,10 +24,21 @@ public class SysUserRoleServiceImpl extends BaseServiceImpl<SysUserRoleMapper, S
 
     @Override
     public SysUserRole checkExist(String roleId, String userId) {
+        if (Constants.ADMIN_ID.equals(userId)) {
+            SysUserRole sysUserRole = new SysUserRole();
+            sysUserRole.setRoleId(roleId);
+            sysUserRole.setUserId(userId);
+            return sysUserRole;
+        }
 
         QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", userId);
         queryWrapper.eq("role_id", roleId);
         return getOne(queryWrapper);
     }
+
+    @Override
+    public List<SysUserRole> listByUser(String userId) {
+        return baseMapper.listByUser(userId);
+    }
 }

src/main/java/com/yunzhi/nanyang/service/impl/SysUserServiceImpl.java

@@ -59,7 +59,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     }
 
     @Override
-    public IPage<SysUser> getPageBy(IPage<SysUser> pg, boolean isAdmin, String userId, String orgId, String name, String phone) {
-        return baseMapper.getPageBy(pg, isAdmin, userId, orgId, name, phone);
+    public IPage<SysUser> getPageBy(IPage<SysUser> pg, String userId, String orgId, String name, String phone) {
+        return baseMapper.getPageBy(pg, Constants.ADMIN_ID, userId, orgId, name, phone);
     }
 }

src/main/resources/mapper/SysRoleMapper.xml

@@ -7,7 +7,7 @@
             t.*
         FROM
             sys_role t
-                <if test="isAdmin">
+                <if test="!isAdmin">
                     INNER JOIN sys_user_role s ON s.role_id = t.role_id AND s.user_id = #{userId}
                 </if>
         WHERE 1=1

src/main/resources/mapper/SysRolePermissionMapper.xml

@@ -6,12 +6,12 @@
         SELECT
             t.permission_id
         FROM
-            sys_role_permission t
+            sys_permission t
                 <if test="!isAdmin">
-                    INNER JOIN sys_user_role s ON s.role_id = t.role_id
+                    INNER JOIN sys_role_permission m on t.permission_id = m.permission_id
+                    INNER JOIN sys_user_role s ON s.role_id = m.role_id
                 </if>
-                INNER JOIN sys_permission m on t.permission_id = m.permission_id
-        WHERE m.resource_type = 'data'
+        WHERE t.resource_type = 'data'
         <if test="!isAdmin">
             AND s.user_id = #{userId}
         </if>
@@ -21,17 +21,7 @@
             t.*
         FROM
             sys_role_permission t
-        <if test="!isAdmin">
-            INNER JOIN sys_user_role s ON s.role_id = t.role_id
-        </if>
-            INNER JOIN sys_permission m on t.permission_id = m.permission_id
-        WHERE m.resource_type = 'data'
-        <if test="!isAdmin">
-            AND s.user_id = #{userId}
-        </if>
-        <if test="roleId != null and roleId != ''">
-            AND t.role_id = #{roleId}
-        </if>
+        WHERE t.role_id = #{roleId}
     </select>
     <select id="countBy" resultType="java.lang.Integer">
         SELECT

src/main/resources/mapper/SysUserMapper.xml

@@ -18,11 +18,12 @@
             *
         FROM
             sys_user t
-            <if test="!isAdmin">
-                <include refid="com.yunzhi.nanyang.mapper.TaOrgMapper.data_scope"></include>
-            </if>
         WHERE
-            1 = 1
+            t.status &gt; -1
+          AND t.user_id != #{adminId}
+        <if test="userId != adminId">
+            AND <include refid="com.yunzhi.nanyang.mapper.TaOrgMapper.data_scope"></include>
+        </if>
           <if test="orgId != null and orgId != ''">
               AND t.org_id = #{orgId}
           </if>

src/main/resources/mapper/SysUserRoleMapper.xml

@@ -16,4 +16,15 @@
         </if>
 
     </select>
+    <select id="listByUser" resultType="com.yunzhi.nanyang.entity.SysUserRole">
+        SELECT
+            t.*,
+            s.`name` as role_name
+        FROM
+            sys_user_role t
+            INNER  JOIN sys_role s on t.role_Id = s.role_id
+        WHERE
+            user_id = #{userId}
+        ORDER BY t.role_id
+    </select>
 </mapper>

src/main/resources/mapper/TaOrgMapper.xml

@@ -3,10 +3,9 @@
 <mapper namespace="com.yunzhi.nanyang.mapper.TaOrgMapper">
 
     <sql id="data_scope">
-        INNER JOIN sys_user_data_scope s ON (
-                ( s.org_id = t.org_id OR t.create_user = s.user_id )
-            AND s.user_id = #{userId}
-            )
+        EXISTS (
+		    SELECT * FROM sys_user_data_scope s WHERE ( ( s.org_id = t.org_id OR t.create_user = s.user_id ) AND s.user_id = #{userId} )
+	    )
     </sql>
 
     <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TaOrg">
@@ -14,8 +13,7 @@
             t.*
         FROM
             ta_org t
-            <include refid="data_scope"></include>
-        WHERE 1 = 1
+        WHERE <include refid="data_scope"></include>
           <if test="name != null and name != ''">
               AND t.`name` like concat('%', #{name} ,'%')
           </if>