commit

src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplyBranchApprovalInterceptor.java

@@ -72,7 +72,7 @@ public class MemberApplyBranchApprovalInterceptor implements FlowInterceptor {
                 sysUser.setId(record.getUserId());
                 sysUser.setMember(true);
                 // 这是HMC的
-                sysUser.setPreparedBy("会员");
+//                sysUser.setPreparedBy("会员");
                 dao.updateIgnoreNull(sysUser);
 
                 // 还要设置会员角色

src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java

@@ -328,7 +328,7 @@ public class MemberManageServiceImpl extends BaseServiceImpl<Sys_user> implement
                     dao().insert(userRole);
                 }
                 // 杭医特有，其他学校请删除
-                record.setPreparedBy("会员");
+//                record.setPreparedBy("会员");
             } else {
 //                if (record.getIsExitActivityMemberScope() != null && record.getIsExitActivityMemberScope()) {
 //                    dao().clear(ActivityUserScope.class, Cnd.where("userId", "=", userId).and("groupId", "=", 1));
@@ -336,7 +336,7 @@ public class MemberManageServiceImpl extends BaseServiceImpl<Sys_user> implement
                 // 非会员取消会员角色
                 dao().clear(Sys_user_role.class, Cnd.where("userId", "=", userId).and("roleId", "=", role.getId()));
                 // 杭医特有，其他学校请删除
-                record.setPreparedBy("教职工");
+//                record.setPreparedBy("教职工");
             }
 
 //            // 加入福利会员  是否加入福利项目

src/main/resources/views/layouts/v4/personCenter.html

@@ -16,7 +16,7 @@ layout("/layouts/v4/baseLayout.html"){
     }
 
     .v4-person-basic-info {
-        height: 150px;
+        height: 250px;
         background: url("/assets/platform/img/v4/person-center/img1.png");
         background-size: cover;
         padding: 20px 50px 30px;
@@ -28,6 +28,8 @@ layout("/layouts/v4/baseLayout.html"){
         height: 100px;
         margin-right: 40px;
         flex-shrink: 0;
+	    position: relative;
+	    top: 25px;
     }
 
     .v4-person-basic-info .info_img img {
@@ -134,4 +136,4 @@ layout("/layouts/v4/baseLayout.html"){
 
 <!--#
 }
-#-->
+#-->

src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js

@@ -350,6 +350,7 @@ const MEMBER_CHANGE = {
     },
     methods: {
         getUnionName(val){
+            debugger
             const data = this.units.find(v => v.id === val)
             this.$set(this.formData, 'unionName', data ? data.unionName : '')
         },