支部成员管理 - 移除“委员分工”字段，改用用户表“角色”字段

ruoyi-system/src/main/java/com/ruoyi/branch/domain/TBranchMember.java

@@ -57,10 +57,6 @@ public class TBranchMember extends BaseEntity
     @Excel(name = "入党时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date partyEntryTime;
 
-    /** 委员分工 */
-    @Excel(name = "委员分工")
-    private String labourDivision;
-
     /** 任职时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "任职时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -264,15 +260,6 @@ public class TBranchMember extends BaseEntity
         return partyEntryTime;
     }
 
-    public void setLabourDivision(String labourDivision) 
-    {
-        this.labourDivision = labourDivision;
-    }
-
-    public String getLabourDivision() 
-    {
-        return labourDivision;
-    }
     public void setLabourEntryTime(Date labourEntryTime) 
     {
         this.labourEntryTime = labourEntryTime;
@@ -402,7 +389,6 @@ public class TBranchMember extends BaseEntity
             .append("workJoinTime", getWorkJoinTime())
             .append("workEntryTime", getWorkEntryTime())
             .append("partyEntryTime", getPartyEntryTime())
-            .append("labourDivision", getLabourDivision())
             .append("labourEntryTime", getLabourEntryTime())
             .append("labourLeaveTime", getLabourLeaveTime())
             .append("entryTime", getEntryTime())

ruoyi-system/src/main/resources/mapper/branch/TBranchMemberMapper.xml

@@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="workJoinTime"    column="work_join_time"    />
         <result property="workEntryTime"    column="work_entry_time"    />
         <result property="partyEntryTime"    column="party_entry_time"    />
-        <result property="labourDivision"    column="labour_division"    />
         <result property="labourEntryTime"    column="labour_entry_time"    />
         <result property="labourLeaveTime"    column="labour_leave_time"    />
         <result property="entryTime"    column="entry_time"    />
@@ -57,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTBranchMemberVo">
-        select u.member_id, u.user_id, u.ethnic, u.member_type, u.birthday, u.education_level, u.work_join_time, u.work_entry_time, u.party_entry_time, u.labour_division, u.labour_entry_time, u.labour_leave_time, u.entry_time, u.leave_time, u.is_league, u.apply_time, u.form_create_time, u.current_mentor, u.plan_develop_duration, u.is_trained, u.remarks, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id,
+        select u.member_id, u.user_id, u.ethnic, u.member_type, u.birthday, u.education_level, u.work_join_time, u.work_entry_time, u.party_entry_time, u.labour_entry_time, u.labour_leave_time, u.entry_time, u.leave_time, u.is_league, u.apply_time, u.form_create_time, u.current_mentor, u.plan_develop_duration, u.is_trained, u.remarks, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id,
         us.NICK_NAME, us.SEX, us.PHONENUMBER,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
         p.post_id, p.post_code, p.post_name, p.post_sort, p.status as post_status
@@ -82,7 +81,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workJoinTime != null "> and u.work_join_time = #{workJoinTime}</if>
             <if test="workEntryTime != null "> and u.work_entry_time = #{workEntryTime}</if>
             <if test="partyEntryTime != null "> and u.party_entry_time = #{partyEntryTime}</if>
-            <if test="labourDivision != null  and labourDivision != ''"> and u.labour_division = #{labourDivision}</if>
             <if test="labourEntryTime != null "> and u.labour_entry_time = #{labourEntryTime}</if>
             <if test="labourLeaveTime != null "> and u.labour_leave_time = #{labourLeaveTime}</if>
             <if test="entryTime != null "> and u.entry_time = #{entryTime}</if>
@@ -122,7 +120,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workJoinTime != null">work_join_time,</if>
             <if test="workEntryTime != null">work_entry_time,</if>
             <if test="partyEntryTime != null">party_entry_time,</if>
-            <if test="labourDivision != null">labour_division,</if>
             <if test="labourEntryTime != null">labour_entry_time,</if>
             <if test="labourLeaveTime != null">labour_leave_time,</if>
             <if test="entryTime != null">entry_time,</if>
@@ -151,7 +148,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workJoinTime != null">#{workJoinTime},</if>
             <if test="workEntryTime != null">#{workEntryTime},</if>
             <if test="partyEntryTime != null">#{partyEntryTime},</if>
-            <if test="labourDivision != null">#{labourDivision},</if>
             <if test="labourEntryTime != null">#{labourEntryTime},</if>
             <if test="labourLeaveTime != null">#{labourLeaveTime},</if>
             <if test="entryTime != null">#{entryTime},</if>
@@ -183,7 +179,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workJoinTime != null">work_join_time = #{workJoinTime},</if>
             <if test="workEntryTime != null">work_entry_time = #{workEntryTime},</if>
             <if test="partyEntryTime != null">party_entry_time = #{partyEntryTime},</if>
-            <if test="labourDivision != null">labour_division = #{labourDivision},</if>
             <if test="labourEntryTime != null">labour_entry_time = #{labourEntryTime},</if>
             <if test="labourLeaveTime != null">labour_leave_time = #{labourLeaveTime},</if>
             <if test="entryTime != null">entry_time = #{entryTime},</if>