feats

src/main/java/com/yunzhi/nanyang/common/StringUtils.java

@@ -3,6 +3,7 @@ package com.yunzhi.nanyang.common;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Random;
+import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -52,6 +53,10 @@ public class StringUtils {
         return sb.toString();
     }
 
+    public static String uuid() {
+        return UUID.randomUUID().toString().replaceAll("-", "");
+    }
+
     public static String urlEncode(String str) {
         try {
             return URLEncoder.encode(str, "UTF-8");

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

@@ -4,10 +4,13 @@ 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 com.yunzhi.nanyang.entity.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +23,8 @@ import com.yunzhi.nanyang.service.ISysMenuService;
 import com.yunzhi.nanyang.entity.SysMenu;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 菜单表 前端控制器
@@ -42,78 +47,18 @@ public class SysMenuController extends BaseController {
 
     /**
      * 分页查询列表
-     * @param pageNum
-     * @param pageSize
      * @return
      */
-    @RequestMapping(value="/sysMenu",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/menu",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysMenuList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<SysMenu> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+    public ResponseBean sysMenuList() throws Exception{
 
-            IPage<SysMenu> result = iSysMenuService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
+        // 管理员可以查看所有菜单
+        // 普通用户只能查看自己授权的
+        SysUser sysUser = currentUser();
+        boolean isAdmin = sysUser.getUserId().equals(Constants.ADMIN_ID);
 
-    /**
-     * 保存对象
-     * @param sysMenu 实体对象
-     * @return
-     */
-    @RequestMapping(value="/sysMenu",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean sysMenuAdd(@ApiParam("保存内容") @RequestBody SysMenu sysMenu) throws Exception{
-
-        if (iSysMenuService.save(sysMenu)){
-            return ResponseBean.success(sysMenu);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/sysMenu/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean sysMenuDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iSysMenuService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param sysMenu 实体对象
-     * @return
-     */
-    @RequestMapping(value="/sysMenu/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean sysMenuUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody SysMenu sysMenu) throws Exception{
-
-        if (iSysMenuService.updateById(sysMenu)){
-            return ResponseBean.success(iSysMenuService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/sysMenu/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysMenuGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iSysMenuService.getById(id));
+        List<SysMenu> result = iSysMenuService.listBy(isAdmin, sysUser.getUserId());
+        return ResponseBean.success(result);
     }
 }

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

@@ -4,7 +4,9 @@ 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 com.yunzhi.nanyang.entity.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +22,8 @@ import com.yunzhi.nanyang.service.ISysPermissionService;
 import com.yunzhi.nanyang.entity.SysPermission;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 权限表 前端控制器
@@ -42,78 +46,19 @@ public class SysPermissionController extends BaseController {
 
     /**
      * 分页查询列表
-     * @param pageNum
-     * @param pageSize
      * @return
      */
-    @RequestMapping(value="/sysPermission",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/permission",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysPermissionList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<SysPermission> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<SysPermission> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<SysPermission> result = iSysPermissionService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
-
-    /**
-     * 保存对象
-     * @param sysPermission 实体对象
-     * @return
-     */
-    @RequestMapping(value="/sysPermission",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean sysPermissionAdd(@ApiParam("保存内容") @RequestBody SysPermission sysPermission) throws Exception{
-
-        if (iSysPermissionService.save(sysPermission)){
-            return ResponseBean.success(sysPermission);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
+    public ResponseBean sysPermissionList() throws Exception{
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/sysPermission/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean sysPermissionDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iSysPermissionService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param sysPermission 实体对象
-     * @return
-     */
-    @RequestMapping(value="/sysPermission/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean sysPermissionUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody SysPermission sysPermission) throws Exception{
+        // 管理员可以查看所有
+        // 普通用户只能查看自己授权的
+        SysUser sysUser = currentUser();
+        boolean isAdmin = sysUser.getUserId().equals(Constants.ADMIN_ID);
 
-        if (iSysPermissionService.updateById(sysPermission)){
-            return ResponseBean.success(iSysPermissionService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
+        List<SysPermission> result = iSysPermissionService.listBy(isAdmin, sysUser.getUserId());
+        return ResponseBean.success(result);
     }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/sysPermission/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysPermissionGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iSysPermissionService.getById(id));
-    }
 }

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

@@ -1,13 +1,17 @@
 package com.yunzhi.nanyang.controller;
 
-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 com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.service.ISysRolePermissionService;
+import com.yunzhi.nanyang.service.ISysUserRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +43,12 @@ public class SysRoleController extends BaseController {
     @Autowired
     public ISysRoleService iSysRoleService;
 
+    @Autowired
+    public ISysUserRoleService iSysUserRoleService;
+
+    @Autowired
+    public ISysRolePermissionService iSysRolePermissionService;
+
 
     /**
      * 分页查询列表
@@ -46,17 +56,20 @@ public class SysRoleController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/sysRole",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/role",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean sysRoleList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                    @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @ApiParam("角色名称") @RequestParam(value ="name", required = false) String name) throws Exception{
 
-		    IPage<SysRole> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<SysRole> pg = new Page<>(pageNum, pageSize);
+        String userId = currentUser().getUserId();
+        boolean isAdmin = userId.equals(Constants.ADMIN_ID);
 
-            IPage<SysRole> result = iSysRoleService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        // 管理员可以查询所有角色
+        // 普通用户只能查询自己授权的角色
+        IPage<SysRole> result = iSysRoleService.getPageBy(pg, isAdmin, userId, name);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,9 +77,20 @@ public class SysRoleController extends BaseController {
      * @param sysRole 实体对象
      * @return
      */
-    @RequestMapping(value="/sysRole",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/role",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    @RequiresPermissions("role:add")
     public ResponseBean sysRoleAdd(@ApiParam("保存内容") @RequestBody SysRole sysRole) throws Exception{
+        sysRole.setRoleId(null);
+
+        if (StringUtils.isEmpty(sysRole.getName())) {
+            return ResponseBean.error("角色名称不能为空");
+        }
+
+        int cnt = iSysRoleService.countBy("name", sysRole.getName(), false);
+        if (cnt > 0) {
+            return ResponseBean.error("名称重复");
+        }
 
         if (iSysRoleService.save(sysRole)){
             return ResponseBean.success(sysRole);
@@ -79,10 +103,20 @@ public class SysRoleController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/sysRole/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/role/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean sysRoleDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    @RequiresPermissions("role:delete")
+    public ResponseBean sysRoleDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+
+        int cnt = iSysUserRoleService.countBy("role_id", id, false);
+        if (cnt > 0) {
+            return ResponseBean.error("请先取消用户授权");
+        }
+
         if(iSysRoleService.removeById(id)){
+
+            iSysRolePermissionService.removeBy("role_id", id, false);
+
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -95,11 +129,23 @@ public class SysRoleController extends BaseController {
      * @param sysRole 实体对象
      * @return
      */
-    @RequestMapping(value="/sysRole/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/role/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean sysRoleUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    @RequiresPermissions("role:update")
+    public ResponseBean sysRoleUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody SysRole sysRole) throws Exception{
 
+        sysRole.setRoleId(id);
+
+        if (StringUtils.isEmpty(sysRole.getName())) {
+            return ResponseBean.error("角色名称不能为空");
+        }
+
+        SysRole origin = iSysRoleService.getByButNot("name", sysRole.getName(), "role_id", id, false);
+        if (origin != null) {
+            return ResponseBean.error("名称重复");
+        }
+
         if (iSysRoleService.updateById(sysRole)){
             return ResponseBean.success(iSysRoleService.getById(id));
         }else {
@@ -111,9 +157,10 @@ public class SysRoleController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/sysRole/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/role/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysRoleGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    @RequiresPermissions("role:view")
+    public ResponseBean sysRoleGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iSysRoleService.getById(id));
     }
 }

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

@@ -4,10 +4,13 @@ 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 com.yunzhi.nanyang.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +23,11 @@ import com.yunzhi.nanyang.service.ISysRolePermissionService;
 import com.yunzhi.nanyang.entity.SysRolePermission;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
     * 角色权限 前端控制器
@@ -42,21 +50,18 @@ public class SysRolePermissionController extends BaseController {
 
     /**
      * 分页查询列表
-     * @param pageNum
-     * @param pageSize
+     * @param roleId
      * @return
      */
-    @RequestMapping(value="/sysRolePermission",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/role-permission",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysRolePermissionList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    public ResponseBean sysRolePermissionList(@ApiParam("角色ID") @RequestParam(value ="roleId", required = false) String roleId) throws Exception{
 
-		    IPage<SysRolePermission> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<SysRolePermission> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        String userId = currentUser().getUserId();
+        boolean isAdmin = userId.equals(Constants.ADMIN_ID);
 
-            IPage<SysRolePermission> result = iSysRolePermissionService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        List<SysRolePermission> result = iSysRolePermissionService.listBy(isAdmin, userId, roleId);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,13 +69,34 @@ public class SysRolePermissionController extends BaseController {
      * @param sysRolePermission 实体对象
      * @return
      */
-    @RequestMapping(value="/sysRolePermission",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/role-permission",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    @RequiresPermissions("role:add")
     public ResponseBean sysRolePermissionAdd(@ApiParam("保存内容") @RequestBody SysRolePermission sysRolePermission) throws Exception{
 
+        String roleId = sysRolePermission.getRoleId();
+        String permissionId = sysRolePermission.getPermissionId();
+
+        if (StringUtils.isEmpty(roleId) || StringUtils.isEmpty(permissionId)) {
+            return ResponseBean.error("授权内容不能为空");
+        }
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("role_id", roleId);
+        params.put("permission_id", permissionId);
+
+        Collection<SysRolePermission> exits = iSysRolePermissionService.listByMap(params);
+        if (exits != null && exits.size() > 0) {
+            return ResponseBean.error("重复授权");
+        }
+
+        if (!checkAccess(currentUser().getUserId(), roleId, permissionId)) {
+            return ResponseBean.error("无权限进行此操作");
+        }
+
         if (iSysRolePermissionService.save(sysRolePermission)){
             return ResponseBean.success(sysRolePermission);
-        }else {
+        } else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
@@ -79,9 +105,20 @@ public class SysRolePermissionController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/sysRolePermission/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/role-permission/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    @RequiresPermissions("role:delete")
     public ResponseBean sysRolePermissionDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+
+        SysRolePermission rolePermission = iSysRolePermissionService.getById(id);
+        if (null == rolePermission) {
+            return ResponseBean.success("success");
+        }
+
+        if (!checkAccess(currentUser().getUserId(), rolePermission.getRoleId(), rolePermission.getPermissionId())) {
+            return ResponseBean.error("无权限进行此操作");
+        }
+
         if(iSysRolePermissionService.removeById(id)){
             return ResponseBean.success("success");
         }else {
@@ -89,31 +126,10 @@ public class SysRolePermissionController extends BaseController {
         }
     }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param sysRolePermission 实体对象
-     * @return
-     */
-    @RequestMapping(value="/sysRolePermission/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean sysRolePermissionUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody SysRolePermission sysRolePermission) throws Exception{
+    private boolean checkAccess(String userId, String roleId, String permissionId) {
+        if (Constants.ADMIN_ID.equals(userId)) return true;
 
-        if (iSysRolePermissionService.updateById(sysRolePermission)){
-            return ResponseBean.success(iSysRolePermissionService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
+        return iSysRolePermissionService.checkAccess(userId, roleId, permissionId);
     }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/sysRolePermission/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysRolePermissionGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iSysRolePermissionService.getById(id));
-    }
 }

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

@@ -49,7 +49,6 @@ public class SysSettingController extends BaseController {
      */
     @RequestMapping(value="/admin/setting",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    @RequiresPermissions("setting")
     public ResponseBean sysSettingList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
@@ -69,7 +68,7 @@ public class SysSettingController extends BaseController {
      */
     @RequestMapping(value="/admin/setting/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    @RequiresPermissions("setting")
+    @RequiresPermissions("setting:update")
     public ResponseBean sysSettingUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody SysSetting sysSetting) throws Exception{
 

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

@@ -3,14 +3,17 @@ package com.yunzhi.nanyang.controller;
 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.ResponseBean;
+import com.yunzhi.nanyang.common.*;
+import com.yunzhi.nanyang.entity.SysLogin;
+import com.yunzhi.nanyang.service.ISysLoginService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,6 +42,12 @@ public class SysUserController extends BaseController {
     @Autowired
     public ISysUserService iSysUserService;
 
+    @Autowired
+    public ISysLoginService iSysLoginService;
+
+    @Value("${yz.default.password}")
+    public String defaultPassword;
+
 
     /**
      * 分页查询列表
@@ -46,17 +55,26 @@ public class SysUserController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/sysUser",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/user",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean sysUserList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                    @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @ApiParam("机构") @RequestParam(value ="org_id", required = false) String orgId,
+                                    @ApiParam("名称") @RequestParam(value ="name", required = false) String name,
+                                    @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone) throws Exception{
 
-		    IPage<SysUser> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        SysUser sysUser = currentUser();
+        String userId = sysUser.getUserId();
+        boolean isAdmin = Constants.ADMIN_ID.equals(userId);
+        if (!isAdmin) {
+            // 不支持非管理员使用机构查询
+            orgId = sysUser.getOrgId();
+        }
+
+        IPage<SysUser> pg = new Page<>(pageNum, pageSize);
 
-            IPage<SysUser> result = iSysUserService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<SysUser> result = iSysUserService.getPageBy(pg, isAdmin, userId, orgId, name, phone);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,11 +82,48 @@ public class SysUserController extends BaseController {
      * @param sysUser 实体对象
      * @return
      */
-    @RequestMapping(value="/sysUser",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/user",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    @RequiresPermissions("user:add")
     public ResponseBean sysUserAdd(@ApiParam("保存内容") @RequestBody SysUser sysUser) throws Exception{
+        sysUser.setUserId(null);
+
+        if (StringUtils.isEmpty(sysUser.getUserName()) || StringUtils.isEmpty(sysUser.getPhone())) {
+            return ResponseBean.error("姓名或者手机不能为空");
+        }
+
+        if (StringUtils.isEmpty(sysUser.getOrgId())) {
+            return ResponseBean.error("所属机构不能为空");
+        }
+
+        int cntPhone = iSysUserService.countBy("phone", sysUser.getPhone(), true);
+        if (cntPhone > 0) {
+            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) {
+                return ResponseBean.error("登录名重复");
+            }
+        }
 
         if (iSysUserService.save(sysUser)){
+            if (!StringUtils.isEmpty(sysUser.getLoginName())) {
+                SysLogin sysLogin = new SysLogin();
+                sysLogin.setLoginId(StringUtils.uuid());
+                sysLogin.setUserId(sysUser.getUserId());
+                sysLogin.setLoginName(sysUser.getLoginName());
+                sysLogin.setPassword(EncryptUtils.md5(EncryptUtils.md5(defaultPassword), sysLogin.getLoginId()));
+                sysLogin.setStatus(Constants.STATUS_NORMAL);
+                iSysLoginService.save(sysLogin);
+            }
+
             return ResponseBean.success(sysUser);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -79,10 +134,23 @@ public class SysUserController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/sysUser/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/user/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean sysUserDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iSysUserService.removeById(id)){
+    @RequiresPermissions("user:delete")
+    public ResponseBean sysUserDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        SysUser sysUser = iSysUserService.getExistBy("user_id", id, false, true);
+        if (sysUser == null) {
+            return ResponseBean.error("用户不存在");
+        }
+
+        boolean canAccess = iSysUserService.canAccessData(sysUser.getOrgId(), currentUser().getUserId());
+        if (!canAccess) {
+            return ResponseBean.error("无机构操作权限");
+        }
+
+        if(iSysUserService.removeLogicById(id)){
+            iSysLoginService.removeLogicByUser(id);
+
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -95,12 +163,48 @@ public class SysUserController extends BaseController {
      * @param sysUser 实体对象
      * @return
      */
-    @RequestMapping(value="/sysUser/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/user/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean sysUserUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    @RequiresPermissions("user:update")
+    public ResponseBean sysUserUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody SysUser sysUser) throws Exception{
 
+        sysUser.setUserId(id);
+
+        if (StringUtils.isEmpty(sysUser.getUserName()) || StringUtils.isEmpty(sysUser.getPhone())) {
+            return ResponseBean.error("姓名或者手机不能为空");
+        }
+
+        if (StringUtils.isEmpty(sysUser.getOrgId())) {
+            return ResponseBean.error("所属机构不能为空");
+        }
+
+        SysUser origin = iSysUserService.getByButNot("phone", sysUser.getPhone(), "user_id", id,true);
+        if (origin != null) {
+            return ResponseBean.error("手机号码重复");
+        }
+
+        boolean canAccess = iSysUserService.canAccessData(sysUser.getOrgId(), currentUser().getUserId());
+        if (!canAccess) {
+            return ResponseBean.error("无机构操作权限");
+        }
+
+        if (!StringUtils.isEmpty(sysUser.getLoginName())) {
+            SysLogin sysLogin = iSysLoginService.getByButNot("login_name", sysUser.getLoginName(), "user_id", id, true);
+            if (sysLogin != null) {
+                return ResponseBean.error("登录名重复");
+            }
+        }
+
         if (iSysUserService.updateById(sysUser)){
+            if (!StringUtils.isEmpty(sysUser.getLoginName())) {
+                SysLogin sysLogin = iSysLoginService.getExistBy("user_id", id, false, true);
+                if (!sysLogin.getLoginName().equals(sysUser.getLoginName())) {
+                    sysLogin.setLoginName(sysUser.getLoginName());
+                    iSysLoginService.updateById(sysLogin);
+                }
+            }
+
             return ResponseBean.success(iSysUserService.getById(id));
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -111,9 +215,32 @@ public class SysUserController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/sysUser/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/user/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysUserGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iSysUserService.getById(id));
+    @RequiresPermissions("user:view")
+    public ResponseBean sysUserGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        SysUser sysUser = iSysUserService.getExistBy("user_id", id, false, true);
+
+        boolean canAccess = iSysUserService.canAccessData(sysUser.getOrgId(), currentUser().getUserId());
+        if (!canAccess) {
+            return ResponseBean.error("无权限操作");
+        }
+
+        SysLogin sysLogin = iSysLoginService.getExistBy("user_id", id, false, true);
+        if (null != sysLogin) {
+            sysUser.setLoginName(sysLogin.getLoginName());
+        }
+
+        return ResponseBean.success(sysUser);
+    }
+
+    /**
+     * 查询用户默认密码
+     */
+    @RequestMapping(value="/admin/user/default/password",method= RequestMethod.GET)
+    @ApiOperation(value="查询用户默认密码", notes = "查询用户默认密码", httpMethod = "GET", response = ResponseBean.class)
+    @RequiresPermissions("user:view")
+    public ResponseBean getDefaultPassword() throws Exception{
+        return ResponseBean.success(defaultPassword);
     }
 }

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

@@ -4,10 +4,17 @@ 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 com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.entity.SysRole;
+import com.yunzhi.nanyang.entity.SysUser;
+import com.yunzhi.nanyang.service.ISysRoleService;
+import com.yunzhi.nanyang.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +27,8 @@ import com.yunzhi.nanyang.service.ISysUserRoleService;
 import com.yunzhi.nanyang.entity.SysUserRole;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 用户角色 前端控制器
@@ -39,24 +48,28 @@ public class SysUserRoleController extends BaseController {
     @Autowired
     public ISysUserRoleService iSysUserRoleService;
 
+    @Autowired
+    public ISysUserService iSysUserService;
+
+    @Autowired
+    public ISysRoleService iSysRoleService;
 
     /**
      * 分页查询列表
-     * @param pageNum
-     * @param pageSize
+     * @param userId
      * @return
      */
-    @RequestMapping(value="/sysUserRole",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/user-role",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysUserRoleList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    @RequiresPermissions("role:view,user:view")
+    public ResponseBean sysUserRoleList(@ApiParam("用户ID") @RequestParam(value ="user_id") String userId) throws Exception{
 
-		    IPage<SysUserRole> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", userId);
+        queryWrapper.orderByDesc("role_id");
 
-            IPage<SysUserRole> result = iSysUserRoleService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        List<SysUserRole> result = iSysUserRoleService.list(queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,10 +77,43 @@ public class SysUserRoleController extends BaseController {
      * @param sysUserRole 实体对象
      * @return
      */
-    @RequestMapping(value="/sysUserRole",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/user-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("用户或者角色不能为空");
+        }
+
+        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("角色不存在");
+        }
+
+        boolean canAccess = iSysUserService.canAccessData(userId, currentUser().getUserId());
+        if (!canAccess) {
+            return ResponseBean.error("无权进行当前操作");
+        }
+
+        SysUserRole origin = iSysUserRoleService.checkExist(sysUserRole.getRoleId(), userId);
+        if (origin != null) {
+            return ResponseBean.success(origin);
+        }
+
+        sysUserRole.setSerialNo(null);
         if (iSysUserRoleService.save(sysUserRole)){
             return ResponseBean.success(sysUserRole);
         }else {
@@ -79,41 +125,31 @@ public class SysUserRoleController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/sysUserRole/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/user-role/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    @RequiresPermissions("user:delete")
     public ResponseBean sysUserRoleDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iSysUserRoleService.removeById(id)){
+        SysUserRole sysUserRole = iSysUserRoleService.getById(id);
+        if (null == sysUserRole) {
             return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
-    }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param sysUserRole 实体对象
-     * @return
-     */
-    @RequestMapping(value="/sysUserRole/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean sysUserRoleUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody SysUserRole sysUserRole) throws Exception{
+        String userId = sysUserRole.getUserId();
+        SysUser sysUser = iSysUserService.getExistBy("user_id", userId, false,true);
+        if (sysUser == null) {
+            return ResponseBean.error("用户不存在");
+        }
 
-        if (iSysUserRoleService.updateById(sysUserRole)){
-            return ResponseBean.success(iSysUserRoleService.getById(id));
+        boolean canAccess = iSysUserService.canAccessData(userId, currentUser().getUserId());
+        if (!canAccess) {
+            return ResponseBean.error("无权进行当前操作");
+        }
+
+        if(iSysUserRoleService.removeById(id)){
+            return ResponseBean.success("success");
         }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/sysUserRole/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysUserRoleGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iSysUserRoleService.getById(id));
-    }
 }

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

@@ -7,6 +7,7 @@ import com.yunzhi.nanyang.common.BaseController;
 import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.ResponseBean;
 import com.yunzhi.nanyang.entity.SysUser;
+import com.yunzhi.nanyang.service.ISysUserDataScopeService;
 import com.yunzhi.nanyang.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +26,8 @@ import com.yunzhi.nanyang.entity.TaOrg;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * <p>
@@ -48,6 +51,9 @@ public class TaOrgController extends BaseController {
     @Autowired
     public ISysUserService iSysUserService;
 
+    @Autowired
+    public ISysUserDataScopeService iSysUserDataScopeService;
+
 
     /**
      * 分页查询列表
@@ -57,14 +63,15 @@ public class TaOrgController extends BaseController {
      */
     @RequestMapping(value="/admin/org",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    @RequiresPermissions("org")
+    @RequiresPermissions("org:view")
     public ResponseBean taOrgList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                  @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                  @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                  @ApiParam("名称") @RequestParam(value ="name", required = false) String name) throws Exception{
 
         IPage<TaOrg> pg = new Page<>(pageNum, pageSize);
         SysUser sysUser = currentUser();
 
-        IPage<TaOrg> result = iTaOrgService.getPageBy(pg, sysUser);
+        IPage<TaOrg> result = iTaOrgService.getPageBy(pg, sysUser, name);
         return ResponseBean.success(result);
     }
 
@@ -75,7 +82,7 @@ public class TaOrgController extends BaseController {
      */
     @RequestMapping(value="/admin/org",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    @RequiresPermissions("org")
+    @RequiresPermissions("org:add")
     public ResponseBean taOrgAdd(@ApiParam("保存内容") @RequestBody TaOrg taOrg) throws Exception{
 
         SysUser sysUser = currentUser();
@@ -96,7 +103,7 @@ public class TaOrgController extends BaseController {
      */
     @RequestMapping(value="/admin/org/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    @RequiresPermissions("org")
+    @RequiresPermissions("org:delete")
     public ResponseBean taOrgDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
 
         int cnt = iSysUserService.countBy("org_id", id, true);
@@ -105,6 +112,10 @@ public class TaOrgController extends BaseController {
         }
 
         if(iTaOrgService.remvoeWithDataScope(id, currentUser().getUserId())){
+            Map<String, Object> filter = new HashMap<>();
+            filter.put("org_id", id);
+            iSysUserDataScopeService.removeByMap(filter);
+
             return ResponseBean.success("success");
         } else {
             return ResponseBean.error("无权限或者ID不正确", ResponseBean.ERROR_UNAVAILABLE);
@@ -119,7 +130,7 @@ public class TaOrgController extends BaseController {
      */
     @RequestMapping(value="/admin/org/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    @RequiresPermissions("org")
+    @RequiresPermissions("org:update")
     public ResponseBean taOrgUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaOrg taOrg) throws Exception{
 
@@ -148,6 +159,7 @@ public class TaOrgController extends BaseController {
      */
     @RequestMapping(value="/admin/org/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    @RequiresPermissions("org:view")
     public ResponseBean taOrgGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         if (!iTaOrgService.canAccessData(id, currentUser().getUserId())) {
             return ResponseBean.error("无权限或者ID不正确");

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

@@ -1,13 +1,14 @@
 package com.yunzhi.nanyang.controller;
 
-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.ResponseBean;
+import com.yunzhi.nanyang.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,17 +47,17 @@ public class TaRegionController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taRegion",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/region",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @RequiresPermissions("region:view")
     public ResponseBean taRegionList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("名称") @RequestParam(value ="name", required = false) String name) throws Exception{
 
-		    IPage<TaRegion> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaRegion> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaRegion> pg = new Page<>(pageNum, pageSize);
 
-            IPage<TaRegion> result = iTaRegionService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaRegion> result = iTaRegionService.getPageBy(pg, currentUser().getUserId(), name);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,10 +65,22 @@ public class TaRegionController extends BaseController {
      * @param taRegion 实体对象
      * @return
      */
-    @RequestMapping(value="/taRegion",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/region",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    @RequiresPermissions("region:add")
     public ResponseBean taRegionAdd(@ApiParam("保存内容") @RequestBody TaRegion taRegion) throws Exception{
 
+        taRegion.setRegionId(null);
+
+        if (StringUtils.isEmpty(taRegion.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        TaRegion origin = iTaRegionService.getExistBy("name", taRegion.getName(), false, true);
+        if (null != origin) {
+            return ResponseBean.error("名称重复");
+        }
+
         if (iTaRegionService.save(taRegion)){
             return ResponseBean.success(taRegion);
         }else {
@@ -79,10 +92,11 @@ public class TaRegionController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taRegion/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/region/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taRegionDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaRegionService.removeById(id)){
+    @RequiresPermissions("region:delete")
+    public ResponseBean taRegionDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaRegionService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -95,10 +109,22 @@ public class TaRegionController extends BaseController {
      * @param taRegion 实体对象
      * @return
      */
-    @RequestMapping(value="/taRegion/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/region/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taRegionUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaRegion taRegion) throws Exception{
+    @RequiresPermissions("region:update")
+    public ResponseBean taRegionUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                        @ApiParam("更新内容") @RequestBody TaRegion taRegion) throws Exception {
+
+        taRegion.setRegionId(id);
+
+        if (StringUtils.isEmpty(taRegion.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        TaRegion other = iTaRegionService.getByButNot("name", taRegion.getName(), "region_id", id, true);
+        if (other != null) {
+            return ResponseBean.error("名称重复");
+        }
 
         if (iTaRegionService.updateById(taRegion)){
             return ResponseBean.success(iTaRegionService.getById(id));
@@ -111,9 +137,10 @@ public class TaRegionController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taRegion/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/region/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taRegionGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaRegionService.getById(id));
+    @RequiresPermissions("region:view")
+    public ResponseBean taRegionGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTaRegionService.getExistBy("region_id", id, false, true));
     }
 }

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

@@ -26,8 +26,8 @@ public class SysLogin implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "登录id")
-    @TableId(value = "login_id", type = IdType.AUTO)
-    private Integer loginId;
+    @TableId(value = "login_id", type = IdType.UUID)
+    private String loginId;
 
     @ApiModelProperty(value = "用户Id")
     private String userId;

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

@@ -35,5 +35,8 @@ public class SysPermission implements Serializable {
     @ApiModelProperty(value = "资源类型")
     private String resourceType;
 
+    @ApiModelProperty(value = "资源ID")
+    private String resourceId;
+
 
 }

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

@@ -3,6 +3,8 @@ package com.yunzhi.nanyang.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.time.LocalDateTime;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,11 +28,14 @@ public class SysRole implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "角色ID")
-    @TableId(value = "role_id", type = IdType.INPUT)
+    @TableId(value = "role_id", type = IdType.UUID)
     private String roleId;
 
     @ApiModelProperty(value = "角色名称")
     private String name;
 
 
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
 }

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

@@ -2,6 +2,8 @@ package com.yunzhi.nanyang.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -57,5 +59,7 @@ public class SysUser implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private LocalDateTime updateDate;
 
-
+    @TableField(exist = false)
+    @ApiModelProperty("登录账号")
+    private String loginName;
 }

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

@@ -27,7 +27,7 @@ public class TaRegion implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "区域Id")
-    @TableId(value = "region_Id", type = IdType.INPUT)
+    @TableId(value = "region_Id", type = IdType.UUID)
     private String regionId;
 
     @ApiModelProperty(value = "区域名")

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

@@ -19,5 +19,7 @@ import java.util.List;
 @Mapper
 public interface SysMenuMapper extends BaseMapper<SysMenu> {
 
-    List<AccessInfo> getAccessList(@Param("userId") String userId, @Param("adminId") String adminId);
+    List<AccessInfo> getAccessList(@Param("isAdmin") boolean isAdmin, @Param("userId") String userId);
+
+    List<SysMenu> listBy(@Param("isAdmin") boolean isAdmin, @Param("userId") String userId);
 }

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

@@ -3,6 +3,11 @@ package com.yunzhi.nanyang.mapper;
 import com.yunzhi.nanyang.entity.SysPermission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -15,4 +20,8 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SysPermissionMapper extends BaseMapper<SysPermission> {
 
+    @Select("select permission_id from sys_permission where resource_type = 'data'")
+    Set<String> getAllDataPermission();
+
+    List<SysPermission> listBy(@Param("isAdmin") boolean isAdmin, @Param("userId") String userId);
 }

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

@@ -1,8 +1,13 @@
 package com.yunzhi.nanyang.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.SysRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Set;
 
 /**
  * <p>
@@ -15,4 +20,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SysRoleMapper extends BaseMapper<SysRole> {
 
+    @Select("select role_id from sys_role")
+    Set<String> getAllRole();
+
+    IPage<SysRole> getPageBy(IPage<SysRole> pg,
+                             @Param("isAdmin") boolean isAdmin,
+                             @Param("userId") String userId,
+                             @Param("name") String name);
 }

src/main/java/com/yunzhi/nanyang/mapper/SysRolePermissionMapper.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;
 
 /**
@@ -18,5 +19,14 @@ import java.util.Set;
 @Mapper
 public interface SysRolePermissionMapper extends BaseMapper<SysRolePermission> {
 
-    Set<String> getPermissionByUser(@Param("userId") String userId);
+    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);
+
+    int countBy(@Param("userId") String userId,
+                    @Param("roleId") String roleId,
+                    @Param("permissionId") String permissionId);
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.SysUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -17,4 +18,11 @@ import org.apache.ibatis.annotations.Param;
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
     SysUser getByLoginId(@Param("loginId") String loginId);
+
+    IPage<SysUser> getPageBy(IPage<SysUser> pg,
+                             @Param("isAdmin") boolean isAdmin,
+                             @Param("userId") String userId,
+                             @Param("orgId") String orgId,
+                             @Param("name") String name,
+                             @Param("phone") String phone);
 }

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

@@ -17,5 +17,5 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TaOrgMapper extends BaseMapper<TaOrg> {
 
-    IPage<TaOrg> getPageBy(IPage<TaOrg> pg, @Param("userId") String userId);
+    IPage<TaOrg> getPageBy(IPage<TaOrg> pg, @Param("userId") String userId, @Param("name") String name);
 }

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

@@ -1,8 +1,10 @@
 package com.yunzhi.nanyang.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaRegion;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaRegionMapper extends BaseMapper<TaRegion> {
 
+    IPage<TaRegion> getPageBy(IPage<TaRegion> pg, @Param("userId") String userId, @Param("name") String name);
 }

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

@@ -12,6 +12,8 @@ public interface IBaseService<T> extends IService<T> {
      */
     boolean removeLogicById(Serializable id);
 
+    boolean removeBy(String column, Object value, boolean notDelete);
+
     boolean canAccessData(Serializable id, String userId);
 
     boolean remvoeWithDataScope(Serializable id, String userId);

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

@@ -12,7 +12,9 @@ import com.yunzhi.nanyang.vo.LoginParam;
  * @author yansen
  * @since 2022-03-07
  */
-public interface ISysLoginService extends IService<SysLogin> {
+public interface ISysLoginService extends IBaseService<SysLogin> {
 
     SysLogin getByLogin(LoginParam loginParam);
+
+    boolean removeLogicByUser(String userId);
 }

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

@@ -3,6 +3,8 @@ package com.yunzhi.nanyang.service;
 import com.yunzhi.nanyang.entity.SysMenu;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 菜单表 服务类
@@ -11,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ISysMenuService extends IService<SysMenu> {
+public interface ISysMenuService extends IBaseService<SysMenu> {
 
+    List<SysMenu> listBy(boolean isAdmin, String userId);
 }

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

@@ -3,6 +3,8 @@ package com.yunzhi.nanyang.service;
 import com.yunzhi.nanyang.entity.SysPermission;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 权限表 服务类
@@ -11,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-07
  */
-public interface ISysPermissionService extends IService<SysPermission> {
+public interface ISysPermissionService extends IBaseService<SysPermission> {
 
+    List<SysPermission> listBy(boolean isAdmin, String userId);
 }

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

@@ -3,6 +3,8 @@ package com.yunzhi.nanyang.service;
 import com.yunzhi.nanyang.entity.SysRolePermission;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 角色权限 服务类
@@ -11,6 +13,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-07
  */
-public interface ISysRolePermissionService extends IService<SysRolePermission> {
+public interface ISysRolePermissionService extends IBaseService<SysRolePermission> {
+
+    List<SysRolePermission> listBy(boolean isAdmin, String userId, String roleId);
 
+    boolean checkAccess(String userId, String roleId, String permissionId);
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.SysRole;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-07
  */
-public interface ISysRoleService extends IService<SysRole> {
+public interface ISysRoleService extends IBaseService<SysRole> {
 
+    IPage<SysRole> getPageBy(IPage<SysRole> pg, boolean isAdmin, String userId, String name);
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ISysSettingService extends IService<SysSetting> {
+public interface ISysSettingService extends IBaseService<SysSetting> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ISysUserDataScopeService extends IService<SysUserDataScope> {
+public interface ISysUserDataScopeService extends IBaseService<SysUserDataScope> {
 
 }

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-07
  */
-public interface ISysUserRoleService extends IService<SysUserRole> {
+public interface ISysUserRoleService extends IBaseService<SysUserRole> {
 
+    SysUserRole checkExist(String roleId, String userId);
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.SysUser;
 
 import java.util.Map;
@@ -17,4 +18,6 @@ public interface ISysUserService extends IBaseService<SysUser> {
     Map<String, Object> getUerProfile(String userId, SysUser sysUser) throws Exception;
 
     SysUser getByLoginId(String loginId);
+
+    IPage<SysUser> getPageBy(IPage<SysUser> pg, boolean isAdmin, String userId, String orgId, String name, String phone);
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaAccountLogService extends IService<TaAccountLog> {
+public interface ITaAccountLogService extends IBaseService<TaAccountLog> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaAccountService extends IService<TaAccount> {
+public interface ITaAccountService extends IBaseService<TaAccount> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaAddressService extends IService<TaAddress> {
+public interface ITaAddressService extends IBaseService<TaAddress> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaBannerService extends IService<TaBanner> {
+public interface ITaBannerService extends IBaseService<TaBanner> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaDispatchService extends IService<TaDispatch> {
+public interface ITaDispatchService extends IBaseService<TaDispatch> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaEvaluationService extends IService<TaEvaluation> {
+public interface ITaEvaluationService extends IBaseService<TaEvaluation> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaExtendContentService extends IService<TaExtendContent> {
+public interface ITaExtendContentService extends IBaseService<TaExtendContent> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaFeedbackService extends IService<TaFeedback> {
+public interface ITaFeedbackService extends IBaseService<TaFeedback> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaImagesService extends IService<TaImages> {
+public interface ITaImagesService extends IBaseService<TaImages> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaMachineryGpsService extends IService<TaMachineryGps> {
+public interface ITaMachineryGpsService extends IBaseService<TaMachineryGps> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaMachineryService extends IService<TaMachinery> {
+public interface ITaMachineryService extends IBaseService<TaMachinery> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaMessageService extends IService<TaMessage> {
+public interface ITaMessageService extends IBaseService<TaMessage> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaNewsService extends IService<TaNews> {
+public interface ITaNewsService extends IBaseService<TaNews> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaNewsTypeService extends IService<TaNewsType> {
+public interface ITaNewsTypeService extends IBaseService<TaNewsType> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaOrderService extends IService<TaOrder> {
+public interface ITaOrderService extends IBaseService<TaOrder> {
 
 }

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

@@ -14,7 +14,7 @@ import com.yunzhi.nanyang.entity.TaOrg;
  */
 public interface ITaOrgService extends IBaseService<TaOrg> {
 
-    IPage<TaOrg> getPageBy(IPage<TaOrg> pg, SysUser sysUser);
+    IPage<TaOrg> getPageBy(IPage<TaOrg> pg, SysUser sysUser, String name);
 
     boolean saveWithDataScope(TaOrg taOrg) throws Exception;
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaPersonService extends IService<TaPerson> {
+public interface ITaPersonService extends IBaseService<TaPerson> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.yunzhi.nanyang.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaRegion;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaRegionService extends IService<TaRegion> {
+public interface ITaRegionService extends IBaseService<TaRegion> {
 
+    IPage<TaRegion> getPageBy(IPage<TaRegion> pg, String userId, String name);
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaUserMachineryService extends IService<TaUserMachinery> {
+public interface ITaUserMachineryService extends IBaseService<TaUserMachinery> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaWithdrawalService extends IService<TaWithdrawal> {
+public interface ITaWithdrawalService extends IBaseService<TaWithdrawal> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaWorkJobService extends IService<TaWorkJob> {
+public interface ITaWorkJobService extends IBaseService<TaWorkJob> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITaWorkJobTypeService extends IService<TaWorkJobType> {
+public interface ITaWorkJobTypeService extends IBaseService<TaWorkJobType> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITdDeviceService extends IService<TdDevice> {
+public interface ITdDeviceService extends IBaseService<TdDevice> {
 
 }

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-03-08
  */
-public interface ITdMachineryTypeService extends IService<TdMachineryType> {
+public interface ITdMachineryTypeService extends IBaseService<TdMachineryType> {
 
 }

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

@@ -22,6 +22,20 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,
         return update(updateWrapper);
     }
 
+    @Override
+    public boolean removeBy(String column, Object value, boolean notDelete) {
+        if (notDelete) {
+            UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.set("status", -1);
+            updateWrapper.eq(column, value);
+            return update(updateWrapper);
+        } else {
+            QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(column, value);
+            return remove(queryWrapper);
+        }
+    }
+
     @Override
     public boolean canAccessData(Serializable id, String userId) {
         TableInfo tableInfo = SqlHelper.table(currentModelClass());
@@ -37,7 +51,7 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,
 
         QueryWrapper<T> wrapper = new QueryWrapper<>();
         wrapper.last(sql);
-        return count(wrapper) > 1;
+        return count(wrapper) > 0;
     }
 
     @Override
@@ -49,7 +63,7 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,
         String kAlias = t + "." + k;
 
         String joinSQL = "INNER JOIN sys_user_data_scope s ON ( "+ kAlias +" = s.org_id OR "+t+".create_user = s.user_id )";
-        String setSQL = "SET " + kAlias + " = -1";
+        String setSQL = "SET status = -1";
         String whereSQL = "WHERE " + kAlias + " = '"+ id +"' AND s.user_id = '" + userId + "'";
 
         String sql = joinSQL + " " + setSQL + " " + whereSQL;

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

@@ -1,14 +1,8 @@
 package com.yunzhi.nanyang.service.impl;
 
 import com.yunzhi.nanyang.common.Constants;
-import com.yunzhi.nanyang.entity.SysLogin;
-import com.yunzhi.nanyang.entity.SysRolePermission;
-import com.yunzhi.nanyang.entity.SysUser;
-import com.yunzhi.nanyang.entity.SysUserRole;
-import com.yunzhi.nanyang.mapper.SysLoginMapper;
-import com.yunzhi.nanyang.mapper.SysRolePermissionMapper;
-import com.yunzhi.nanyang.mapper.SysUserMapper;
-import com.yunzhi.nanyang.mapper.SysUserRoleMapper;
+import com.yunzhi.nanyang.entity.*;
+import com.yunzhi.nanyang.mapper.*;
 import com.yunzhi.nanyang.shiro.realms.manager.IManagerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,9 +21,15 @@ public class ManagerServiceImpl implements IManagerService {
     @Autowired
     SysUserRoleMapper sysUserRoleMapper;
 
+    @Autowired
+    SysRoleMapper sysRoleMapper;
+
     @Autowired
     SysRolePermissionMapper sysRolePermissionMapper;
 
+    @Autowired
+    SysPermissionMapper sysPermissionMapper;
+
     @Override
     public Boolean verify(String id) {
         SysLogin sysLogin = sysLoginMapper.selectById(id);
@@ -43,13 +43,21 @@ public class ManagerServiceImpl implements IManagerService {
     @Override
     public Set<String> getRolesByLoginId(String id) {
         SysLogin sysLogin = sysLoginMapper.selectById(id);
+
+        if (sysLogin.getUserId().equals(Constants.ADMIN_ID)) {
+            return sysRoleMapper.getAllRole();
+        }
+
         return sysUserRoleMapper.getRoleByUser(sysLogin.getUserId());
     }
 
     @Override
     public Set<String> getPermissionsLoginId(String id) {
         SysLogin sysLogin = sysLoginMapper.selectById(id);
-        return sysRolePermissionMapper.getPermissionByUser(sysLogin.getUserId());
+        String userId = sysLogin.getUserId();
+        boolean isAdmin = userId.equals(Constants.ADMIN_ID);
+
+        return sysRolePermissionMapper.getPermissionByUser(isAdmin, userId);
     }
 
 }

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

@@ -1,5 +1,7 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.entity.SysLogin;
 import com.yunzhi.nanyang.mapper.SysLoginMapper;
 import com.yunzhi.nanyang.service.ISysLoginService;
@@ -16,10 +18,19 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-07
  */
 @Service
-public class SysLoginServiceImpl extends ServiceImpl<SysLoginMapper, SysLogin> implements ISysLoginService {
+public class SysLoginServiceImpl extends BaseServiceImpl<SysLoginMapper, SysLogin> implements ISysLoginService {
 
     @Override
     public SysLogin getByLogin(LoginParam loginParam) {
         return baseMapper.getByLogin(loginParam.getLoginType(), loginParam.getUserName());
     }
+
+    @Override
+    public boolean removeLogicByUser(String userId) {
+        UpdateWrapper<SysLogin> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("status", Constants.STATUS_DELETE);
+        updateWrapper.eq("user_id", userId);
+
+        return update(updateWrapper);
+    }
 }

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

@@ -6,6 +6,8 @@ import com.yunzhi.nanyang.service.ISysMenuService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 菜单表 服务实现类
@@ -15,6 +17,10 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
+public class SysMenuServiceImpl extends BaseServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
 
+    @Override
+    public List<SysMenu> listBy(boolean isAdmin, String userId) {
+        return baseMapper.listBy(isAdmin, userId);
+    }
 }

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

@@ -6,6 +6,8 @@ import com.yunzhi.nanyang.service.ISysPermissionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 权限表 服务实现类
@@ -15,6 +17,10 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-07
  */
 @Service
-public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, SysPermission> implements ISysPermissionService {
+public class SysPermissionServiceImpl extends BaseServiceImpl<SysPermissionMapper, SysPermission> implements ISysPermissionService {
 
+    @Override
+    public List<SysPermission> listBy(boolean isAdmin, String userId) {
+        return baseMapper.listBy(isAdmin, userId);
+    }
 }

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

@@ -6,6 +6,8 @@ import com.yunzhi.nanyang.service.ISysRolePermissionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 角色权限 服务实现类
@@ -15,6 +17,15 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-07
  */
 @Service
-public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionMapper, SysRolePermission> implements ISysRolePermissionService {
+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);
+    }
 
+    @Override
+    public boolean checkAccess(String userId, String roleId, String permissionId) {
+        return baseMapper.countBy(userId, roleId, permissionId) > 0;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.SysRole;
 import com.yunzhi.nanyang.mapper.SysRoleMapper;
 import com.yunzhi.nanyang.service.ISysRoleService;
@@ -15,6 +16,10 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-07
  */
 @Service
-public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
+public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
 
+    @Override
+    public IPage<SysRole> getPageBy(IPage<SysRole> pg, boolean isAdmin, String userId, String name) {
+        return baseMapper.getPageBy(pg, isAdmin, userId, name);
+    }
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class SysSettingServiceImpl extends ServiceImpl<SysSettingMapper, SysSetting> implements ISysSettingService {
+public class SysSettingServiceImpl extends BaseServiceImpl<SysSettingMapper, SysSetting> implements ISysSettingService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class SysUserDataScopeServiceImpl extends ServiceImpl<SysUserDataScopeMapper, SysUserDataScope> implements ISysUserDataScopeService {
+public class SysUserDataScopeServiceImpl extends BaseServiceImpl<SysUserDataScopeMapper, SysUserDataScope> implements ISysUserDataScopeService {
 
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.nanyang.entity.SysUserRole;
 import com.yunzhi.nanyang.mapper.SysUserRoleMapper;
 import com.yunzhi.nanyang.service.ISysUserRoleService;
@@ -15,6 +16,14 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-07
  */
 @Service
-public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {
+public class SysUserRoleServiceImpl extends BaseServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {
 
+    @Override
+    public SysUserRole checkExist(String roleId, String userId) {
+
+        QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", userId);
+        queryWrapper.eq("role_id", roleId);
+        return getOne(queryWrapper);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.entity.SysUser;
 import com.yunzhi.nanyang.mapper.SysMenuMapper;
@@ -45,7 +46,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
         res.put("user", sysUser);
 
         // 管理员的账号是 1
-        List<AccessInfo> menu = sysMenuMapper.getAccessList(userId, Constants.ADMIN_ID);
+        boolean isAdmin = userId.equals(Constants.ADMIN_ID);
+        List<AccessInfo> menu = sysMenuMapper.getAccessList(isAdmin, userId);
         res.put("menu", menu);
 
         return res;
@@ -55,4 +57,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     public SysUser getByLoginId(String loginId) {
         return baseMapper.getByLoginId(loginId);
     }
+
+    @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);
+    }
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaAccountLogServiceImpl extends ServiceImpl<TaAccountLogMapper, TaAccountLog> implements ITaAccountLogService {
+public class TaAccountLogServiceImpl extends BaseServiceImpl<TaAccountLogMapper, TaAccountLog> implements ITaAccountLogService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaAccountServiceImpl extends ServiceImpl<TaAccountMapper, TaAccount> implements ITaAccountService {
+public class TaAccountServiceImpl extends BaseServiceImpl<TaAccountMapper, TaAccount> implements ITaAccountService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaAddressServiceImpl extends ServiceImpl<TaAddressMapper, TaAddress> implements ITaAddressService {
+public class TaAddressServiceImpl extends BaseServiceImpl<TaAddressMapper, TaAddress> implements ITaAddressService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaBannerServiceImpl extends ServiceImpl<TaBannerMapper, TaBanner> implements ITaBannerService {
+public class TaBannerServiceImpl extends BaseServiceImpl<TaBannerMapper, TaBanner> implements ITaBannerService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaDispatchServiceImpl extends ServiceImpl<TaDispatchMapper, TaDispatch> implements ITaDispatchService {
+public class TaDispatchServiceImpl extends BaseServiceImpl<TaDispatchMapper, TaDispatch> implements ITaDispatchService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaEvaluationServiceImpl extends ServiceImpl<TaEvaluationMapper, TaEvaluation> implements ITaEvaluationService {
+public class TaEvaluationServiceImpl extends BaseServiceImpl<TaEvaluationMapper, TaEvaluation> implements ITaEvaluationService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaExtendContentServiceImpl extends ServiceImpl<TaExtendContentMapper, TaExtendContent> implements ITaExtendContentService {
+public class TaExtendContentServiceImpl extends BaseServiceImpl<TaExtendContentMapper, TaExtendContent> implements ITaExtendContentService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaFeedbackServiceImpl extends ServiceImpl<TaFeedbackMapper, TaFeedback> implements ITaFeedbackService {
+public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaFeedback> implements ITaFeedbackService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaImagesServiceImpl extends ServiceImpl<TaImagesMapper, TaImages> implements ITaImagesService {
+public class TaImagesServiceImpl extends BaseServiceImpl<TaImagesMapper, TaImages> implements ITaImagesService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaMachineryGpsServiceImpl extends ServiceImpl<TaMachineryGpsMapper, TaMachineryGps> implements ITaMachineryGpsService {
+public class TaMachineryGpsServiceImpl extends BaseServiceImpl<TaMachineryGpsMapper, TaMachineryGps> implements ITaMachineryGpsService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaMachineryServiceImpl extends ServiceImpl<TaMachineryMapper, TaMachinery> implements ITaMachineryService {
+public class TaMachineryServiceImpl extends BaseServiceImpl<TaMachineryMapper, TaMachinery> implements ITaMachineryService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaMessageServiceImpl extends ServiceImpl<TaMessageMapper, TaMessage> implements ITaMessageService {
+public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMessage> implements ITaMessageService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> implements ITaNewsService {
+public class TaNewsServiceImpl extends BaseServiceImpl<TaNewsMapper, TaNews> implements ITaNewsService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsType> implements ITaNewsTypeService {
+public class TaNewsTypeServiceImpl extends BaseServiceImpl<TaNewsTypeMapper, TaNewsType> implements ITaNewsTypeService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaOrderServiceImpl extends ServiceImpl<TaOrderMapper, TaOrder> implements ITaOrderService {
+public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder> implements ITaOrderService {
 
 }

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

@@ -27,8 +27,8 @@ public class TaOrgServiceImpl extends BaseServiceImpl<TaOrgMapper, TaOrg> implem
     SysUserDataScopeMapper sysUserDataScopeMapper;
 
     @Override
-    public IPage<TaOrg> getPageBy(IPage<TaOrg> pg, SysUser sysUser) {
-        return baseMapper.getPageBy(pg, sysUser.getUserId());
+    public IPage<TaOrg> getPageBy(IPage<TaOrg> pg, SysUser sysUser, String name) {
+        return baseMapper.getPageBy(pg, sysUser.getUserId(), name);
     }
 
     @Transactional(rollbackFor = Exception.class)

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> implements ITaPersonService {
+public class TaPersonServiceImpl extends BaseServiceImpl<TaPersonMapper, TaPerson> implements ITaPersonService {
 
 }

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

@@ -1,9 +1,9 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaRegion;
 import com.yunzhi.nanyang.mapper.TaRegionMapper;
 import com.yunzhi.nanyang.service.ITaRegionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +15,10 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaRegionServiceImpl extends ServiceImpl<TaRegionMapper, TaRegion> implements ITaRegionService {
+public class TaRegionServiceImpl extends BaseServiceImpl<TaRegionMapper, TaRegion> implements ITaRegionService {
 
+    @Override
+    public IPage<TaRegion> getPageBy(IPage<TaRegion> pg, String userId, String name) {
+        return baseMapper.getPageBy(pg, userId, name);
+    }
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaUserMachineryServiceImpl extends ServiceImpl<TaUserMachineryMapper, TaUserMachinery> implements ITaUserMachineryService {
+public class TaUserMachineryServiceImpl extends BaseServiceImpl<TaUserMachineryMapper, TaUserMachinery> implements ITaUserMachineryService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaWithdrawalServiceImpl extends ServiceImpl<TaWithdrawalMapper, TaWithdrawal> implements ITaWithdrawalService {
+public class TaWithdrawalServiceImpl extends BaseServiceImpl<TaWithdrawalMapper, TaWithdrawal> implements ITaWithdrawalService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaWorkJobServiceImpl extends ServiceImpl<TaWorkJobMapper, TaWorkJob> implements ITaWorkJobService {
+public class TaWorkJobServiceImpl extends BaseServiceImpl<TaWorkJobMapper, TaWorkJob> implements ITaWorkJobService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TaWorkJobTypeServiceImpl extends ServiceImpl<TaWorkJobTypeMapper, TaWorkJobType> implements ITaWorkJobTypeService {
+public class TaWorkJobTypeServiceImpl extends BaseServiceImpl<TaWorkJobTypeMapper, TaWorkJobType> implements ITaWorkJobTypeService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TdDeviceServiceImpl extends ServiceImpl<TdDeviceMapper, TdDevice> implements ITdDeviceService {
+public class TdDeviceServiceImpl extends BaseServiceImpl<TdDeviceMapper, TdDevice> implements ITdDeviceService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-08
  */
 @Service
-public class TdMachineryTypeServiceImpl extends ServiceImpl<TdMachineryTypeMapper, TdMachineryType> implements ITdMachineryTypeService {
+public class TdMachineryTypeServiceImpl extends BaseServiceImpl<TdMachineryTypeMapper, TdMachineryType> implements ITdMachineryTypeService {
 
 }

src/main/resources/application.yml

@@ -29,6 +29,8 @@ sms:
 
 ###
 yz:
+  default:
+    password: 888888
   sms:
     ## 可以任意名称
     appid: state-grid-training

src/main/resources/mapper/SysMenuMapper.xml

@@ -5,12 +5,35 @@
     <select id="getAccessList" resultType="com.yunzhi.nanyang.vo.AccessInfo">
         SELECT DISTINCT
             t.menu_id AS permission,
-            IF ( #{userId} = #{adminId} , 1, IF ( s.role_id IS NULL, 0, 1 ) ) AS can_access
+        <if test="isAdmin">
+            1 AS can_access
+        </if>
+        <if test="!isAdmin">
+            IF ( s.role_id IS NULL, 0, 1 ) AS can_access
+        </if>
         FROM
             sys_menu t
-                LEFT JOIN sys_role_permission s ON s.permission_id LIKE concat( t.menu_id, '%' )
+        <if test="!isAdmin">
+                LEFT JOIN sys_role_permission s ON s.permission_id = t.menu_id
                 LEFT JOIN sys_user_role m ON m.role_id = s.role_id
                 AND m.user_id = #{userId}
+        </if>
+        WHERE
+            t.`status` = 1
+        ORDER BY
+            t.sort_no
+    </select>
+    <select id="listBy" resultType="com.yunzhi.nanyang.entity.SysMenu">
+        SELECT
+            DISTINCT
+            t.*
+        FROM
+            sys_menu t
+            <if test="!isAdmin">
+                INNER JOIN sys_role_permission s ON s.permission_id = t.menu_id
+                INNER JOIN sys_user_role m ON m.role_id = s.role_id
+                AND m.user_id = #{userId}
+            </if>
         WHERE
             t.`status` = 1
         ORDER BY

src/main/resources/mapper/SysPermissionMapper.xml

@@ -2,4 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.SysPermissionMapper">
 
+    <select id="listBy" resultType="com.yunzhi.nanyang.entity.SysPermission">
+        SELECT DISTINCT
+            t.*
+        FROM
+            sys_permission t
+            <if test="!isAdmin">
+                INNER JOIN sys_role_permission s ON s.permission_id = t.permission_id
+                INNER JOIN sys_user_role m ON m.role_id = s.role_id
+                AND m.user_id = #{userId}
+            </if>
+        WHERE t.resource_type = 'data'
+        ORDER BY
+            t.resource_id ASC,
+            t.permission_id ASC
+    </select>
 </mapper>

src/main/resources/mapper/SysRoleMapper.xml

@@ -2,4 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.SysRoleMapper">
 
+    <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.SysRole">
+        SELECT
+            t.*
+        FROM
+            sys_role t
+                <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
+            <if test="name != null and name != ''">
+                t.`name` like concat('%', #{name}, '%')
+            </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/SysRolePermissionMapper.xml

@@ -7,13 +7,41 @@
             t.permission_id
         FROM
             sys_role_permission t
-                INNER JOIN sys_user_role s ON s.role_id = t.role_id
-        WHERE
-        <if test="null == userId or userId == ''">
-            s.user_id = 'a-string-not-real-user-id'
+                <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>
+    </select>
+    <select id="listBy" resultType="com.yunzhi.nanyang.entity.SysRolePermission">
+        SELECT DISTINCT
+            t.*
+        FROM
+            sys_role_permission t
+        <if test="!isAdmin">
+            INNER JOIN sys_user_role s ON s.role_id = t.role_id
         </if>
-        <if test="null != userId and userId != ''">
-            s.user_id = #{userId}
+            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>
+    </select>
+    <select id="countBy" resultType="java.lang.Integer">
+        SELECT
+            count( 1 )
+        FROM
+            sys_user_role t
+                INNER JOIN sys_role_permission s ON t.role_id = s.role_id
+        WHERE
+            t.user_id = #{userId}
+          AND t.role_id = #{roleId}
+          AND s.permission_id = #{permissionId}
     </select>
 </mapper>

src/main/resources/mapper/SysUserMapper.xml

@@ -13,4 +13,26 @@
           AND t.`status` = 1
           AND s.`status` = 1
     </select>
+    <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.SysUser">
+        SELECT
+            *
+        FROM
+            sys_user t
+            <if test="!isAdmin">
+                <include refid="com.yunzhi.nanyang.mapper.TaOrgMapper.data_scope"></include>
+            </if>
+        WHERE
+            1 = 1
+          <if test="orgId != null and orgId != ''">
+              AND t.org_id = #{orgId}
+          </if>
+          <if test="name != null and name != ''">
+              AND t.user_name LIKE concat( '%', #{name}, '%' )
+          </if>
+          <if test="phone != null and phone != ''">
+              AND t.phone LIKE concat( '%', #{phone}, '%' )
+          </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaOrgMapper.xml

@@ -2,14 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <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}
+            )
+    </sql>
+
     <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TaOrg">
         SELECT
             t.*
         FROM
             ta_org t
-                INNER JOIN sys_user_data_scope s ON ( s.org_id = t.org_id OR t.create_date = s.user_id )
-        WHERE
-            s.user_id = #{userId}
+            <include refid="data_scope"></include>
+        WHERE 1 = 1
+          <if test="name != null and name != ''">
+              AND t.`name` like concat('%', #{name} ,'%')
+          </if>
           AND t.`status` &gt; -1
         ORDER BY
             t.create_date DESC

src/main/resources/mapper/TaRegionMapper.xml

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.TaRegionMapper">
 
+    <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TaRegion">
+        SELECT
+            *
+        FROM
+            ta_region t
+        WHERE
+            1 = 1
+          <if test="name != null and name != ''">
+              AND t.`name` LIKE concat( '%', #{name}, '%' )
+          </if>
+          AND t.`status` &gt; -1
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>