支部成员管理 - 修改“现培养人”字段数据类型

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

@@ -93,7 +93,7 @@ public class TBranchMember extends BaseEntity
 
     /** 现培养人 */
     @Excel(name = "现培养人")
-    private String currentMentor;
+    private Long currentMentor;
 
     /** 计划发展时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -323,12 +323,12 @@ public class TBranchMember extends BaseEntity
     {
         return formCreateTime;
     }
-    public void setCurrentMentor(String currentMentor) 
+    public void setCurrentMentor(Long currentMentor)
     {
         this.currentMentor = currentMentor;
     }
 
-    public String getCurrentMentor() 
+    public Long getCurrentMentor()
     {
         return currentMentor;
     }

ruoyi-ui/src/views/branch/member1/index.vue

@@ -130,7 +130,7 @@
           <span>{{ parseTime(scope.row.formCreateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="现培养人" align="center" prop="currentMentor"  width="100" :formatter="userListFormat" />
+      <el-table-column label="现培养人" align="center" prop="currentMentor"  width="100" :formatter="currentMentorFormat" />
       <el-table-column label="计划发展时间" align="center" prop="planDevelopDuration" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planDevelopDuration, '{y}-{m}-{d}') }}</span>
@@ -606,6 +606,10 @@
       userListFormat(row, column) {
         return this.selectDictLabel(this.userList, row.userId);
       },
+      // 现培养人字典翻译
+      currentMentorFormat(row, column) {
+        return this.selectDictLabel(this.userList, row.currentMentor);
+      },
       // 取消按钮
       cancel() {
         this.open = false;