用户添加的修改

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

@@ -38,6 +38,12 @@ public class ProjectUser extends Model<ProjectUser> {
     @TableField("user_id")
     private Integer userId;
 
+    /**
+     * 所属方
+     */
+    @TableField("subordinate")
+    private Integer subordinate;
+
 
     public Integer getId() {
         return id;
@@ -63,6 +69,14 @@ public class ProjectUser extends Model<ProjectUser> {
         this.userId = userId;
     }
 
+    public Integer getSubordinate() {
+        return subordinate;
+    }
+
+    public void setSubordinate(Integer subordinate) {
+        this.subordinate = subordinate;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -74,6 +88,7 @@ public class ProjectUser extends Model<ProjectUser> {
         "id=" + id +
         ", projectId=" + projectId +
         ", userId=" + userId +
+        ", subordinate=" + subordinate +
         "}";
     }
 }

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_role");
+        strategy.setInclude("tb_project_user");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -7,11 +7,12 @@
         <id column="id" property="id" />
         <result column="project_id" property="projectId" />
         <result column="user_id" property="userId" />
+        <result column="subordinate" property="subordinate" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_id, user_id
+        id, project_id, user_id, subordinate
     </sql>
 
 </mapper>

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

@@ -19,4 +19,17 @@
         id, role_name, dowload_power, upload_power, view_power, approval_power, indate, subordinate
     </sql>
 
+    <select id="getListByKeyName" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from
+        tb_role
+        <where>
+            <if test="keyName != null and keyName != ''">
+                role_name like concat('%',#{keyName},'%')
+            </if>
+        </where>
+        Limit #{start},#{pageSize}
+    </select>
+
 </mapper>