1

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardClassifyInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.cardClassifyInfo", description = "名片分类")
 public interface ICardClassifyInfoService{
 	@HttpMethod(description = "新增",  permissionName = "名片分类管理")
-	public Boolean add(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表", permissionName = "名片分类管理")
 	public Page<CardClassifyInfo> list(
@@ -39,8 +38,7 @@ public interface ICardClassifyInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "名片分类管理")
-	public Boolean update(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询",  permissionName = "名片分类管理")
 	public CardClassifyInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardHolderInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.cardHolderInfo", description = "名片夹")
 public interface ICardHolderInfoService{
 	@HttpMethod(description = "新增",  permissionName = "名片夹管理")
-	public Boolean add(@NotNull @HttpParam(name = "cardHolderInfo", type = HttpParamType.COMMON, description = "名片夹") CardHolderInfo cardHolderInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "cardHolderInfo", type = HttpParamType.COMMON, description = "名片夹") CardHolderInfo cardHolderInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表",  permissionName = "名片夹管理")
 	public Page<CardHolderInfo> list(
@@ -39,8 +38,7 @@ public interface ICardHolderInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "名片夹管理")
-	public Boolean update(@NotNull @HttpParam(name = "cardHolderInfo", type = HttpParamType.COMMON, description = "名片夹") CardHolderInfo cardHolderInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "cardHolderInfo", type = HttpParamType.COMMON, description = "名片夹") CardHolderInfo cardHolderInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询", permissionName = "名片夹管理")
 	public CardHolderInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardManagementInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.cardManagementInfo", description = "名片管理")
 public interface ICardManagementInfoService{
 	@HttpMethod(description = "新增",  permissionName = "名片管理管理")
-	public Boolean add(@NotNull @HttpParam(name = "cardManagementInfo", type = HttpParamType.COMMON, description = "名片管理") CardManagementInfo cardManagementInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "cardManagementInfo", type = HttpParamType.COMMON, description = "名片管理") CardManagementInfo cardManagementInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表",  permissionName = "名片管理管理")
 	public Page<CardManagementInfo> list(
@@ -47,8 +46,7 @@ public interface ICardManagementInfoService{
 						@HttpParam(name = "deleteCondition", type = HttpParamType.COMMON, description = "删除条件") String deleteCondition)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "名片管理管理")
-	public Boolean update(@NotNull @HttpParam(name = "cardManagementInfo", type = HttpParamType.COMMON, description = "名片管理") CardManagementInfo cardManagementInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "cardManagementInfo", type = HttpParamType.COMMON, description = "名片管理") CardManagementInfo cardManagementInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询", permissionName = "名片管理管理")
 	public CardManagementInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICertificateManagementInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.certificateManagementInfo", description = "证件管理")
 public interface ICertificateManagementInfoService{
 	@HttpMethod(description = "新增", permissionName = "证件管理管理")
-	public Boolean add(@NotNull @HttpParam(name = "certificateManagementInfo", type = HttpParamType.COMMON, description = "证件管理") CertificateManagementInfo certificateManagementInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "certificateManagementInfo", type = HttpParamType.COMMON, description = "证件管理") CertificateManagementInfo certificateManagementInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表",  permissionName = "证件管理管理")
 	public Page<CertificateManagementInfo> list(
@@ -39,8 +38,7 @@ public interface ICertificateManagementInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "证件管理管理")
-	public Boolean update(@NotNull @HttpParam(name = "certificateManagementInfo", type = HttpParamType.COMMON, description = "证件管理") CertificateManagementInfo certificateManagementInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "certificateManagementInfo", type = HttpParamType.COMMON, description = "证件管理") CertificateManagementInfo certificateManagementInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询",  permissionName = "证件管理管理")
 	public CertificateManagementInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICircleCardInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.circleCardInfo", description = "圈子个人关系")
 public interface ICircleCardInfoService{
 	@HttpMethod(description = "新增",  permissionName = "圈子个人关系管理")
-	public Boolean add(@NotNull @HttpParam(name = "circleCardInfo", type = HttpParamType.COMMON, description = "圈子个人关系") CircleCardInfo circleCardInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "circleCardInfo", type = HttpParamType.COMMON, description = "圈子个人关系") CircleCardInfo circleCardInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表", permissionName = "圈子个人关系管理")
 	public Page<CircleCardInfo> list(
@@ -39,8 +38,7 @@ public interface ICircleCardInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "circleId", type = HttpParamType.COMMON, description = "圈子id")String circleId)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "圈子个人关系管理")
-	public Boolean update(@NotNull @HttpParam(name = "circleCardInfo", type = HttpParamType.COMMON, description = "圈子个人关系") CircleCardInfo circleCardInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "circleCardInfo", type = HttpParamType.COMMON, description = "圈子个人关系") CircleCardInfo circleCardInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询",  permissionName = "圈子个人关系管理")
 	public CircleCardInfo get(@NotNull @HttpParam(name = "circleId", type = HttpParamType.COMMON, description = "圈子id")String circleId)throws ServiceException;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICircleManagementInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.circleManagementInfo", description = "圈子管理")
 public interface ICircleManagementInfoService{
 	@HttpMethod(description = "新增",  permissionName = "圈子管理管理")
-	public Boolean add(@NotNull @HttpParam(name = "circleManagementInfo", type = HttpParamType.COMMON, description = "圈子管理") CircleManagementInfo circleManagementInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "circleManagementInfo", type = HttpParamType.COMMON, description = "圈子管理") CircleManagementInfo circleManagementInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表",  permissionName = "圈子管理管理")
 	public Page<CircleManagementInfo> list(
@@ -40,8 +39,7 @@ public interface ICircleManagementInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "圈子管理管理")
-	public Boolean update(@NotNull @HttpParam(name = "circleManagementInfo", type = HttpParamType.COMMON, description = "圈子管理") CircleManagementInfo circleManagementInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "circleManagementInfo", type = HttpParamType.COMMON, description = "圈子管理") CircleManagementInfo circleManagementInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询",  permissionName = "圈子管理管理")
 	public CircleManagementInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICommonUserInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.commonUserInfo", description = "用户管理")
 public interface ICommonUserInfoService{
 	@HttpMethod(description = "新增",  permissionName = "用户管理管理")
-	public Boolean add(@NotNull @HttpParam(name = "commonUserInfo", type = HttpParamType.COMMON, description = "用户管理") CommonUserInfo commonUserInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "commonUserInfo", type = HttpParamType.COMMON, description = "用户管理") CommonUserInfo commonUserInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表",  permissionName = "用户管理管理")
 	public Page<CommonUserInfo> list(
@@ -44,8 +43,7 @@ public interface ICommonUserInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "用户管理管理")
-	public Boolean update(@NotNull @HttpParam(name = "commonUserInfo", type = HttpParamType.COMMON, description = "用户管理") CommonUserInfo commonUserInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "commonUserInfo", type = HttpParamType.COMMON, description = "用户管理") CommonUserInfo commonUserInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询", permissionName = "用户管理管理")
 	public CommonUserInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/IPersonalHomepageInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.personalHomepageInfo", description = "个人主页")
 public interface IPersonalHomepageInfoService{
 	@HttpMethod(description = "新增",  permissionName = "个人主页管理")
-	public Boolean add(@NotNull @HttpParam(name = "personalHomepageInfo", type = HttpParamType.COMMON, description = "个人主页") PersonalHomepageInfo personalHomepageInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "personalHomepageInfo", type = HttpParamType.COMMON, description = "个人主页") PersonalHomepageInfo personalHomepageInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表",  permissionName = "个人主页管理")
 	public Page<PersonalHomepageInfo> list(
@@ -45,8 +44,7 @@ public interface IPersonalHomepageInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
 	@HttpMethod(description = "修改", permissionName = "个人主页管理")
-	public Boolean update(@NotNull @HttpParam(name = "personalHomepageInfo", type = HttpParamType.COMMON, description = "个人主页") PersonalHomepageInfo personalHomepageInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "personalHomepageInfo", type = HttpParamType.COMMON, description = "个人主页") PersonalHomepageInfo personalHomepageInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询",  permissionName = "个人主页管理")
 	public PersonalHomepageInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ISearchRecordsInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.searchRecordsInfo", description = "搜索记录")
 public interface ISearchRecordsInfoService{
 	@HttpMethod(description = "新增", permissionName = "搜索记录管理")
-	public Boolean add(@NotNull @HttpParam(name = "searchRecordsInfo", type = HttpParamType.COMMON, description = "搜索记录") SearchRecordsInfo searchRecordsInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "searchRecordsInfo", type = HttpParamType.COMMON, description = "搜索记录") SearchRecordsInfo searchRecordsInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表", permissionName = "搜索记录管理")
 	public Page<SearchRecordsInfo> list(
@@ -39,8 +38,7 @@ public interface ISearchRecordsInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "搜索记录管理")
-	public Boolean update(@NotNull @HttpParam(name = "searchRecordsInfo", type = HttpParamType.COMMON, description = "搜索记录") SearchRecordsInfo searchRecordsInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "searchRecordsInfo", type = HttpParamType.COMMON, description = "搜索记录") SearchRecordsInfo searchRecordsInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询", permissionName = "搜索记录管理")
 	public SearchRecordsInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardClassifyInfoServiceImpl.java

@@ -30,11 +30,10 @@ public class CardClassifyInfoServiceImpl implements ICardClassifyInfoService{
 	private CardClassifyInfoMapper cardClassifyInfoMapper;
 	
 	@Override
-	public Boolean add(CardClassifyInfo cardClassifyInfo,Long adminId) throws ServiceException {
+	public Boolean add(CardClassifyInfo cardClassifyInfo) throws ServiceException {
 		Date now = new Date();
 		cardClassifyInfo.setGmtCreate(now);
 		cardClassifyInfo.setGmtUpdate(now);
-		cardClassifyInfo.setCommonId(adminId);
 		return cardClassifyInfoMapper.insert(cardClassifyInfo)>0;
 	}
 
@@ -80,10 +79,9 @@ public class CardClassifyInfoServiceImpl implements ICardClassifyInfoService{
 	}
 
 	@Override
-	public Boolean update(CardClassifyInfo cardClassifyInfo,Long adminId) throws ServiceException {
+	public Boolean update(CardClassifyInfo cardClassifyInfo) throws ServiceException {
 		Date now = new Date();
 		cardClassifyInfo.setGmtUpdate(now);
-		cardClassifyInfo.setCommonId(adminId);
 		return cardClassifyInfoMapper.updateById(cardClassifyInfo)>0;
 	}
 

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardHolderInfoServiceImpl.java

@@ -35,11 +35,10 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService{
 	private CardManagementInfoMapper cardManagementInfoMapper;
 	
 	@Override
-	public Boolean add(CardHolderInfo cardHolderInfo,Long adminId) throws ServiceException {
+	public Boolean add(CardHolderInfo cardHolderInfo) throws ServiceException {
 		Date now = new Date();
 		cardHolderInfo.setGmtCreate(now);
 		cardHolderInfo.setGmtUpdate(now);
-		cardHolderInfo.setCommonId(adminId);
 		return cardHolderInfoMapper.insert(cardHolderInfo)>0;
 	}
 
@@ -93,10 +92,9 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService{
 	}
 
 	@Override
-	public Boolean update(CardHolderInfo cardHolderInfo,Long adminId) throws ServiceException {
+	public Boolean update(CardHolderInfo cardHolderInfo) throws ServiceException {
 		Date now = new Date();
 		cardHolderInfo.setGmtUpdate(now);
-		cardHolderInfo.setCommonId(adminId);
 		return cardHolderInfoMapper.updateById(cardHolderInfo)>0;
 	}
 

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardManagementInfoServiceImpl.java

@@ -37,11 +37,10 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
 	private CardHolderInfoMapper cardHolderInfoMapper;
 	
 	@Override
-	public Boolean add(CardManagementInfo cardManagementInfo,Long adminId) throws ServiceException {
+	public Boolean add(CardManagementInfo cardManagementInfo) throws ServiceException {
 		Date now = new Date();
 		cardManagementInfo.setGmtCreate(now);
 		cardManagementInfo.setGmtUpdate(now);
-		cardManagementInfo.setCommonId(adminId);
 		return cardManagementInfoMapper.insert(cardManagementInfo)>0;
 	}
 
@@ -122,10 +121,9 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
 	}
 
 	@Override
-	public Boolean update(CardManagementInfo cardManagementInfo,Long adminId) throws ServiceException {
+	public Boolean update(CardManagementInfo cardManagementInfo) throws ServiceException {
 		Date now = new Date();
 		cardManagementInfo.setGmtUpdate(now);
-		cardManagementInfo.setCommonId(adminId);
 		return cardManagementInfoMapper.updateById(cardManagementInfo)>0;
 	}
 

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CertificateManagementInfoServiceImpl.java

@@ -30,11 +30,10 @@ public class CertificateManagementInfoServiceImpl implements ICertificateManagem
 	private CertificateManagementInfoMapper certificateManagementInfoMapper;
 	
 	@Override
-	public Boolean add(CertificateManagementInfo certificateManagementInfo,Long adminId) throws ServiceException {
+	public Boolean add(CertificateManagementInfo certificateManagementInfo) throws ServiceException {
 		Date now = new Date();
 		certificateManagementInfo.setGmtCreate(now);
 		certificateManagementInfo.setGmtUpdate(now);
-		certificateManagementInfo.setCommonId(adminId);
 		return certificateManagementInfoMapper.insert(certificateManagementInfo)>0;
 	}
 
@@ -80,10 +79,9 @@ public class CertificateManagementInfoServiceImpl implements ICertificateManagem
 	}
 
 	@Override
-	public Boolean update(CertificateManagementInfo certificateManagementInfo,Long adminId) throws ServiceException {
+	public Boolean update(CertificateManagementInfo certificateManagementInfo) throws ServiceException {
 		Date now = new Date();
 		certificateManagementInfo.setGmtUpdate(now);
-		certificateManagementInfo.setCommonId(adminId);
 		return certificateManagementInfoMapper.updateById(certificateManagementInfo)>0;
 	}
 

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CircleCardInfoServiceImpl.java

@@ -30,11 +30,10 @@ public class CircleCardInfoServiceImpl implements ICircleCardInfoService{
 	private CircleCardInfoMapper circleCardInfoMapper;
 	
 	@Override
-	public Boolean add(CircleCardInfo circleCardInfo,Long adminId) throws ServiceException {
+	public Boolean add(CircleCardInfo circleCardInfo) throws ServiceException {
 		Date now = new Date();
 		circleCardInfo.setGmtCreate(now);
 		circleCardInfo.setGmtUpdate(now);
-		circleCardInfo.setCommonId(adminId);
 		return circleCardInfoMapper.insert(circleCardInfo)>0;
 	}
 
@@ -80,10 +79,9 @@ public class CircleCardInfoServiceImpl implements ICircleCardInfoService{
 	}
 
 	@Override
-	public Boolean update(CircleCardInfo circleCardInfo,Long adminId) throws ServiceException {
+	public Boolean update(CircleCardInfo circleCardInfo) throws ServiceException {
 		Date now = new Date();
 		circleCardInfo.setGmtUpdate(now);
-		circleCardInfo.setCommonId(adminId);
 		return circleCardInfoMapper.updateById(circleCardInfo)>0;
 	}
 

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CircleManagementInfoServiceImpl.java

@@ -1,7 +1,12 @@
 package com.iotechn.unimall.admin.api.card.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.iotechn.unimall.data.domain.CardManagementInfo;
+import com.iotechn.unimall.data.domain.CircleCardInfo;
+import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
+import com.iotechn.unimall.data.mapper.CircleCardInfoMapper;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,13 +33,16 @@ import org.springframework.transaction.annotation.Transactional;
 public class CircleManagementInfoServiceImpl implements ICircleManagementInfoService{
 	@Autowired
 	private CircleManagementInfoMapper circleManagementInfoMapper;
+	@Autowired
+	private CircleCardInfoMapper circleCardInfoMapper;
+	@Autowired
+	private CardManagementInfoMapper cardManagementInfoMapper;
 	
 	@Override
-	public Boolean add(CircleManagementInfo circleManagementInfo,Long adminId) throws ServiceException {
+	public Boolean add(CircleManagementInfo circleManagementInfo) throws ServiceException {
 		Date now = new Date();
 		circleManagementInfo.setGmtCreate(now);
 		circleManagementInfo.setGmtUpdate(now);
-		circleManagementInfo.setCommonId(adminId);
 		return circleManagementInfoMapper.insert(circleManagementInfo)>0;
 	}
 
@@ -83,16 +91,27 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
 	}
 
 	@Override
-	public Boolean update(CircleManagementInfo circleManagementInfo,Long adminId) throws ServiceException {
+	public Boolean update(CircleManagementInfo circleManagementInfo) throws ServiceException {
 		Date now = new Date();
 		circleManagementInfo.setGmtUpdate(now);
-		circleManagementInfo.setCommonId(adminId);
 		return circleManagementInfoMapper.updateById(circleManagementInfo)>0;
 	}
 
 	@Override
 	public CircleManagementInfo get(Long id) throws ServiceException {
-		return circleManagementInfoMapper.selectById(id);
+		CircleManagementInfo circleManagementInfo=circleManagementInfoMapper.selectById(id);
+		//查询圈子名片关系表
+		List<CircleCardInfo> circleCardInfoList=circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>().eq("circle_id",id));
+		List<CardManagementInfo> cardManagementInfoList=new ArrayList<>();
+		for(CircleCardInfo circleCardInfo:circleCardInfoList){
+			//查询名片信息
+			CardManagementInfo cardManagementInfo=cardManagementInfoMapper.selectById(circleCardInfo.getCardId());
+			if (cardManagementInfo!=null){
+				cardManagementInfoList.add(cardManagementInfo);
+			}
+		}
+		circleManagementInfo.setCardManagementInfoList(cardManagementInfoList);
+		return circleManagementInfo;
 	}
 	
 	@Override

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CommonUserInfoServiceImpl.java

@@ -30,11 +30,10 @@ public class CommonUserInfoServiceImpl implements ICommonUserInfoService{
 	private CommonUserInfoMapper commonUserInfoMapper;
 	
 	@Override
-	public Boolean add(CommonUserInfo commonUserInfo,Long adminId) throws ServiceException {
+	public Boolean add(CommonUserInfo commonUserInfo) throws ServiceException {
 		Date now = new Date();
 		commonUserInfo.setGmtCreate(now);
 		commonUserInfo.setGmtUpdate(now);
-		commonUserInfo.setId(adminId);
 		return commonUserInfoMapper.insert(commonUserInfo)>0;
 	}
 
@@ -95,10 +94,9 @@ public class CommonUserInfoServiceImpl implements ICommonUserInfoService{
 	}
 
 	@Override
-	public Boolean update(CommonUserInfo commonUserInfo,Long adminId) throws ServiceException {
+	public Boolean update(CommonUserInfo commonUserInfo) throws ServiceException {
 		Date now = new Date();
 		commonUserInfo.setGmtUpdate(now);
-		commonUserInfo.setId(adminId);
 		return commonUserInfoMapper.updateById(commonUserInfo)>0;
 	}
 

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/PersonalHomepageInfoServiceImpl.java

@@ -30,11 +30,10 @@ public class PersonalHomepageInfoServiceImpl implements IPersonalHomepageInfoSer
 	private PersonalHomepageInfoMapper personalHomepageInfoMapper;
 	
 	@Override
-	public Boolean add(PersonalHomepageInfo personalHomepageInfo,Long adminId) throws ServiceException {
+	public Boolean add(PersonalHomepageInfo personalHomepageInfo) throws ServiceException {
 		Date now = new Date();
 		personalHomepageInfo.setGmtCreate(now);
 		personalHomepageInfo.setGmtUpdate(now);
-		personalHomepageInfo.setCommonId(adminId);
 		return personalHomepageInfoMapper.insert(personalHomepageInfo)>0;
 	}
 
@@ -98,10 +97,9 @@ public class PersonalHomepageInfoServiceImpl implements IPersonalHomepageInfoSer
 	}
 
 	@Override
-	public Boolean update(PersonalHomepageInfo personalHomepageInfo,Long adminId) throws ServiceException {
+	public Boolean update(PersonalHomepageInfo personalHomepageInfo) throws ServiceException {
 		Date now = new Date();
 		personalHomepageInfo.setGmtUpdate(now);
-		personalHomepageInfo.setCommonId(adminId);
 		return personalHomepageInfoMapper.updateById(personalHomepageInfo)>0;
 	}
 

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/SearchRecordsInfoServiceImpl.java

@@ -30,11 +30,10 @@ public class SearchRecordsInfoServiceImpl implements ISearchRecordsInfoService{
 	private SearchRecordsInfoMapper searchRecordsInfoMapper;
 	
 	@Override
-	public Boolean add(SearchRecordsInfo searchRecordsInfo,Long adminId) throws ServiceException {
+	public Boolean add(SearchRecordsInfo searchRecordsInfo) throws ServiceException {
 		Date now = new Date();
 		searchRecordsInfo.setGmtCreate(now);
 		searchRecordsInfo.setGmtUpdate(now);
-		searchRecordsInfo.setCommonId(adminId);
 		return searchRecordsInfoMapper.insert(searchRecordsInfo)>0;
 	}
 
@@ -80,10 +79,9 @@ public class SearchRecordsInfoServiceImpl implements ISearchRecordsInfoService{
 	}
 
 	@Override
-	public Boolean update(SearchRecordsInfo searchRecordsInfo,Long adminId) throws ServiceException {
+	public Boolean update(SearchRecordsInfo searchRecordsInfo) throws ServiceException {
 		Date now = new Date();
 		searchRecordsInfo.setGmtUpdate(now);
-		searchRecordsInfo.setCommonId(adminId);
 		return searchRecordsInfoMapper.updateById(searchRecordsInfo)>0;
 	}
 

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CircleManagementInfo.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.enums.FieldFill;
 import com.iotechn.unimall.core.util.StringUtils;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 圈子管理对象 circle_management_info
@@ -63,6 +64,9 @@ public class CircleManagementInfo extends SuperDO {
     @TableField("delete_flag")
     private Long deleteFlag;
 
+    @TableField(exist = false)
+    private List<CardManagementInfo> cardManagementInfoList;
+
 
     @Override
     public String toString() {