Forráskód Böngészése

会员收费设置修改人

zouxuan 4 éve
szülő
commit
612c232a06

+ 12 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MemberRankOrganizationFeeMapper.java

@@ -18,6 +18,9 @@ public class MemberRankOrganizationFeeMapper {
 
 	/**  */
 	private Integer operatorId;
+
+	/**  */
+	private String operatorName;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -32,7 +35,15 @@ public class MemberRankOrganizationFeeMapper {
 	private Integer memberFeeSettingId;
 
 	private MemberFeeSetting memberFeeSetting;
-	
+
+	public String getOperatorName() {
+		return operatorName;
+	}
+
+	public void setOperatorName(String operatorName) {
+		this.operatorName = operatorName;
+	}
+
 	public MemberFeeSetting getMemberFeeSetting() {
 		return memberFeeSetting;
 	}

+ 3 - 1
mec-biz/src/main/resources/config/mybatis/MemberRankOrganizationFeeMapperMapper.xml

@@ -12,6 +12,7 @@
 		<result column="member_rank_setting_id_" property="memberRankSettingId" />
 		<result column="member_fee_setting_id_" property="memberFeeSettingId" />
 		<result column="operator_id_" property="operatorId" />
+		<result column="operator_name_" property="operatorName" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="rank_name_" property="rankName" />
@@ -68,11 +69,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MemberRankOrganizationFeeMapper" parameterType="map">
-		SELECT mrofm.*,o.name_ organ_name_,mrs.name_ rank_name_,mfs.*,mfs.id_ member_fee_setting_id_
+		SELECT mrofm.*,o.name_ organ_name_,mrs.name_ rank_name_,mfs.*,mfs.id_ member_fee_setting_id_,su.real_name_ operator_name_
 		FROM member_rank_organization_fee_mapper mrofm
 		LEFT JOIN member_rank_setting mrs ON  mrofm.member_rank_setting_id_ = mrs.id_
 		LEFT JOIN member_fee_setting mfs ON mfs.id_ = mrofm.member_fee_setting_id_
 		LEFT JOIN organization o ON o.id_ = mrofm.organ_id_
+		LEFT JOIN sys_user su ON su.id_ = mrofm.operator_id_
 		<where>
 			<if test="search != null and search != ''">
 				AND mrs.name_ LIKE CONCAT('%',#{search},'%')

+ 10 - 0
mec-web/src/main/java/com/ym/mec/web/controller/MemberRankOrganizationFeeMapperController.java

@@ -40,6 +40,11 @@ public class MemberRankOrganizationFeeMapperController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('memberRankOrganizationFeeMapper/add')")
     @AuditLogAnnotation(operateName = "新增系统功能类型")
     public Object add(@RequestBody MemberRankOrganizationFeeMapper memberRankOrganizationFeeMapper) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        memberRankOrganizationFeeMapper.setOperatorId(sysUser.getId());
         memberRankOrganizationFeeMapperService.add(memberRankOrganizationFeeMapper);
         return succeed();
     }
@@ -48,6 +53,11 @@ public class MemberRankOrganizationFeeMapperController extends BaseController {
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('memberRankOrganizationFeeMapper/update')")
     public Object update(@RequestBody MemberRankOrganizationFeeMapper memberRankOrganizationFeeMapper) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        memberRankOrganizationFeeMapper.setOperatorId(sysUser.getId());
         memberRankOrganizationFeeMapperService.updateFee(memberRankOrganizationFeeMapper);
         return succeed();
     }