角色删除判断权限

cloud-model/src/main/java/com/hssx/cloudmodel/controller/UserController.java

@@ -49,7 +49,7 @@ public class UserController {
      * @return
      */
     @ApiOperation(value = "普通用户登录", notes = "登录方法")
-    @RequestMapping("login")
+    @RequestMapping("/login")
     @ResponseBody
     public HttpRespMsg sysLogin(User user, HttpServletRequest request,
                                 HttpServletResponse response) {
@@ -63,7 +63,7 @@ public class UserController {
      * @return
      */
     @ApiOperation(value = "获取公司列表")
-    @RequestMapping("getCompanyList")
+    @RequestMapping("/getCompanyList")
     @ResponseBody
     public HttpRespMsg getCompanyList(){
         HttpRespMsg msg = new HttpRespMsg();
@@ -77,7 +77,7 @@ public class UserController {
      * @return
      */
     @ApiOperation(value = "获取角色列表")
-    @RequestMapping("getRoleList")
+    @RequestMapping("/getRoleList")
     @ResponseBody
     public HttpRespMsg getRoleList(){
         HttpRespMsg msg = new HttpRespMsg();

cloud-model/src/main/java/com/hssx/cloudmodel/entity/User.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-07-26
+ * @since 2019-07-27
  */
 @TableName("tb_user")
 public class User extends Model<User> {
@@ -52,7 +52,7 @@ public class User extends Model<User> {
     private String mobile;
 
     /**
-     * (供应商)角色类型，0-项目经理 1-普通用户。(客户方)5-客服方领导，6-客户方普通人员
+     * (供应商)角色类型，-1-超级管理员 0-项目经理 1-普通用户。(客户方)5-客服方领导，6-客户方普通人员
      */
     @TableField("role_type")
     private Integer roleType;
@@ -100,7 +100,7 @@ public class User extends Model<User> {
     private LocalDateTime indate;
 
     /**
-     * 用户token
+     * token用户凭证
      */
     @TableField("head_imgurl")
     private String headImgurl;
@@ -112,7 +112,7 @@ public class User extends Model<User> {
     private String teamName;
 
     /**
-     * 所属方，0-供应商 1-客户方
+     * 所属方，-1-超级管理员,0-供应商 1-客户方
      */
     @TableField("subordinate_type")
     private Integer subordinateType;

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_project");
+        strategy.setInclude("tb_user");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

cloud-model/src/main/resources/mapper/UserMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.UserMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.User">
+        <id column="id" property="id" />
+        <result column="account" property="account" />
+        <result column="username" property="username" />
+        <result column="password" property="password" />
+        <result column="mobile" property="mobile" />
+        <result column="role_type" property="roleType" />
+        <result column="company_id" property="companyId" />
+        <result column="parent_id" property="parentId" />
+        <result column="sex" property="sex" />
+        <result column="dep_no" property="depNo" />
+        <result column="work_state" property="workState" />
+        <result column="is_disable" property="isDisable" />
+        <result column="indate" property="indate" />
+        <result column="head_imgurl" property="headImgurl" />
+        <result column="team_name" property="teamName" />
+        <result column="subordinate_type" property="subordinateType" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, account, username, password, mobile, role_type, company_id, parent_id, sex, dep_no, work_state, is_disable, indate, head_imgurl, team_name, subordinate_type
+    </sql>
+
+</mapper>

cloud-model/src/test/java/com/hssx/cloudmodel/CloudModelApplicationTests.java

@@ -1,5 +1,7 @@
 package com.hssx.cloudmodel;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.Role;
 import com.hssx.cloudmodel.service.RoleService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -16,6 +18,11 @@ public class CloudModelApplicationTests {
     private RoleService roleService;
     @Test
     public void contextLoads() {
+        //mybatis-plus只查询特定字段的测试
+        QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("id", "role_name");
+        List<Role> list = roleService.list(queryWrapper);
+        System.out.println(list);
     }
 
 }