用户 项目层叠

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/User.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author 吴涛涛
- * @since 2020-02-11
+ * @since 2020-02-12
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -75,18 +75,24 @@ public class User extends Model<User> {
     @TableField("company_id")
     private Integer companyId;
 
-    /**
-     * 时薪
-     */
-    @TableField(value = "cost", updateStrategy = FieldStrategy.IGNORED)
-    private BigDecimal cost;
-
     /**
      * 部门表外键
      */
     @TableField("department_id")
     private Integer departmentId;
 
+    /**
+     * 部门层级
+     */
+    @TableField("department_cascade")
+    private String departmentCascade;
+
+    /**
+     * 时薪
+     */
+    @TableField(value = "cost", updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal cost;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DepartmentServiceImpl.java

@@ -115,7 +115,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 if (departmentMapper.deleteById(department) == 0) {
                     httpRespMsg.setError("修改失败");
                 } else {
-                    userMapper.update(new User().setDepartmentId(0), new QueryWrapper<User>()
+                    userMapper.update(new User().setDepartmentId(0).setDepartmentCascade("0"), new QueryWrapper<User>()
                             .eq("company_id", companyId)
                             .eq("department_id", departmentId));
                 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/CodeGenerator.java

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

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/UserMapper.xml

@@ -12,19 +12,20 @@
         <result column="create_time" property="createTime"/>
         <result column="role" property="role"/>
         <result column="company_id" property="companyId"/>
-        <result column="cost" property="cost"/>
         <result column="department_id" property="departmentId"/>
+        <result column="department_cascade" property="departmentCascade"/>
+        <result column="cost" property="cost"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, phone, password, portrait_url, create_time, role, company_id, cost, department_id
+        id, name, phone, password, portrait_url, create_time, role, company_id, department_id, department_cascade, cost
     </sql>
 
     <!--单独分页获取人员-->
     <select id="getUserByDepartment" resultType="java.util.Map">
         SELECT a.id, a.name, a.phone, a.portrait_url AS portraitUrl, a.role, a.company_id AS companyId, a.cost,
-        a.department_id AS departmentId, b.department_name AS departmentName
+        a.department_id AS departmentId, b.department_name AS departmentName, a.department_cascade AS departmentCascade
         FROM user AS a
         LEFT JOIN department AS b ON a.department_id = b.department_id
         WHERE a.company_id = #{companyId}
@@ -46,7 +47,7 @@
     <!--范围分页获取人员-->
     <select id="getUserByDepartmentList" resultType="java.util.Map">
         SELECT a.id, a.name, a.phone, a.portrait_url AS portraitUrl, a.role, a.company_id AS companyId, a.cost,
-        a.department_id AS departmentId, b.department_name AS departmentName
+        a.department_id AS departmentId, b.department_name AS departmentName, a.department_cascade AS departmentCascade
         FROM user AS a
         LEFT JOIN department AS b ON a.department_id = b.department_id
         WHERE a.company_id = #{companyId} AND a.department_id IN
@@ -64,4 +65,5 @@
             #{departmentId}
         </foreach>
     </select>
+
 </mapper>