diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java
index d5f068673..89fd8d4a3 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java
@@ -2,20 +2,21 @@ package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.MemberGroup;
import com.jsowell.pile.vo.web.MemberGroupVO;
+import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 会员组Mapper接口
- *
+ *
* @author jsowell
* @date 2023-12-26
*/
-public interface MemberGroupMapper
-{
+@Repository
+public interface MemberGroupMapper {
/**
* 查询会员组
- *
+ *
* @param id 会员组主键
* @return 会员组
*/
@@ -23,7 +24,7 @@ public interface MemberGroupMapper
/**
* 查询会员组列表
- *
+ *
* @param memberGroup 会员组
* @return 会员组集合
*/
@@ -31,7 +32,7 @@ public interface MemberGroupMapper
/**
* 新增会员组
- *
+ *
* @param memberGroup 会员组
* @return 结果
*/
@@ -39,7 +40,7 @@ public interface MemberGroupMapper
/**
* 修改会员组
- *
+ *
* @param memberGroup 会员组
* @return 结果
*/
@@ -47,7 +48,7 @@ public interface MemberGroupMapper
/**
* 删除会员组
- *
+ *
* @param id 会员组主键
* @return 结果
*/
@@ -55,7 +56,7 @@ public interface MemberGroupMapper
/**
* 批量删除会员组
- *
+ *
* @param ids 需要删除的数据主键集合
* @return 结果
*/
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
index 1347e5b74..6bb3ce4fd 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
@@ -2,11 +2,13 @@ package com.jsowell.pile.service.impl;
import com.google.common.collect.Lists;
import com.jsowell.common.util.DateUtils;
+import com.jsowell.common.util.SecurityUtils;
import com.jsowell.common.util.id.IdUtils;
import com.jsowell.pile.domain.MemberGroup;
import com.jsowell.pile.mapper.MemberGroupMapper;
import com.jsowell.pile.service.MemberGroupService;
import com.jsowell.pile.vo.web.MemberGroupVO;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -19,6 +21,7 @@ import java.util.List;
* @author jsowell
* @date 2023-12-26
*/
+@Slf4j
@Service
public class MemberGroupServiceImpl implements MemberGroupService {
@Autowired
@@ -61,6 +64,12 @@ public class MemberGroupServiceImpl implements MemberGroupService {
// 生成编号
memberGroup.setGroupCode(generateGroupCode());
memberGroup.setCreateTime(DateUtils.getNowDate());
+ try {
+ String createBy = SecurityUtils.getLoginUser().getUsername();
+ memberGroup.setCreateBy(createBy);
+ } catch (Exception e) {
+
+ }
return memberGroupMapper.insertMemberGroup(memberGroup);
}
diff --git a/jsowell-ui/src/views/member/memberGroup/index.vue b/jsowell-ui/src/views/member/memberGroup/index.vue
index b48394525..b386eba5a 100644
--- a/jsowell-ui/src/views/member/memberGroup/index.vue
+++ b/jsowell-ui/src/views/member/memberGroup/index.vue
@@ -163,9 +163,14 @@
:value="station.id" />
-
+
+
+
+ {{item.label}}
+
+
+
@@ -301,7 +306,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
- this.title = "添加会员组";
+ this.title = "添加集团";
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -310,7 +315,7 @@ export default {
getMemberGroup(id).then(response => {
this.form = response.data;
this.open = true;
- this.title = "修改会员组";
+ this.title = "修改集团";
});
},
/** 提交按钮 */