名片收藏字段修改

db/add.sql

@@ -114,4 +114,5 @@ PRIMARY KEY  (`id`)
 -- 2024-12-5
 -- ----------------------------
 ALTER TABLE mortals_xhx_company ADD COLUMN   `background` varchar(256)   default ''  COMMENT '背景图片';
+ALTER TABLE `mortals_xhx_favorites_businesscard` CHANGE `staffId` `bussinesscardId` bigint(20) NOT NULL     COMMENT '名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏';
 

enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/req/FavoriteReq.java

@@ -25,7 +25,7 @@ public class FavoriteReq extends BaseReq {
     /**
      * 名片id
      */
-    private  long staffId;
+    private  long bussinesscardId;
 
     /**
      * 分类Id

enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/FavoriteApiController.java

@@ -94,10 +94,10 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{
 
                     rest.setMsg("收藏新闻成功");
                 }
-                if(!ObjectUtils.isEmpty(favoriteReq.getStaffId()) && favoriteReq.getStaffId() != 0){
+                if(!ObjectUtils.isEmpty(favoriteReq.getBussinesscardId()) && favoriteReq.getBussinesscardId() != 0){
                     FavoritesBusinesscardEntity favoritesBusinesscardEntity = new FavoritesBusinesscardEntity();
                     favoritesBusinesscardEntity.setUserId(iUser.getId());
-                    favoritesBusinesscardEntity.setStaffId(favoriteReq.getStaffId());
+                    favoritesBusinesscardEntity.setBussinesscardId(favoriteReq.getBussinesscardId());
                     favoritesBusinesscardEntity.setCreateTime(new Date());
                     favoritesBusinesscardEntity.setCreateUserId(iUser.getId());
                     favoritesBusinesscardEntity.setFavoriteTime(new Date());
@@ -146,11 +146,11 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{
                     }
                     rest.setMsg("取消收藏新闻成功");
                 }
-                if(!ObjectUtils.isEmpty(favoriteReq.getStaffId()) && favoriteReq.getStaffId() != 0){
+                if(!ObjectUtils.isEmpty(favoriteReq.getBussinesscardId()) && favoriteReq.getBussinesscardId() != 0){
 
                     FavoritesBusinesscardEntity query = new FavoritesBusinesscardEntity();
                     query.setUserId(iUser.getId());
-                    query.setStaffId(favoriteReq.getStaffId());
+                    query.setBussinesscardId(favoriteReq.getBussinesscardId());
                     FavoritesBusinesscardEntity favoritesBusinesscardEntity = favoritesBusinesscardService.selectOne(query);
                     if(favoritesBusinesscardEntity!=null) {
                         favoritesBusinesscardService.remove(favoritesBusinesscardEntity.getId(), context);
@@ -210,7 +210,7 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{
                 if(!ObjectUtils.isEmpty(favoriteReq) && favoriteReq.getTypeId() != 0){
                     switch (favoriteReq.getTypeId()){
                         case 1:   //产品收藏
-                            List<FavoritesProductEntity> productList = favoritesProductService.find(new FavoritesProductQuery().id(userId));
+                            List<FavoritesProductEntity> productList = favoritesProductService.find(new FavoritesProductQuery().userId(userId));
                             if(!ObjectUtils.isEmpty(productList)){
                                 List<ProductEntity> list = new ArrayList<>();
                                 for (int i = 0; i < productList.size(); i++) {
@@ -227,7 +227,7 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{
                             }
                             break;
                         case 2:   //新闻收藏
-                            List<FavoritesNewsEntity> newsList = favoritesNewsService.find(new FavoritesNewsQuery().id(userId));
+                            List<FavoritesNewsEntity> newsList = favoritesNewsService.find(new FavoritesNewsQuery().userId(userId));
                             if(!ObjectUtils.isEmpty(newsList)){
                                 List<NewsEntity> list = new ArrayList<>();
                                 for (int i = 0; i < newsList.size(); i++) {
@@ -244,11 +244,11 @@ public class FavoriteApiController extends AbstractBaseController<FavoriteReq>{
                             }
                             break;
                         case 3:   //名片收藏
-                            List<FavoritesBusinesscardEntity> cardList = favoritesBusinesscardService.find(new FavoritesBusinesscardQuery().id(userId));
+                            List<FavoritesBusinesscardEntity> cardList = favoritesBusinesscardService.find(new FavoritesBusinesscardQuery().userId(userId));
                             if(!ObjectUtils.isEmpty(cardList)){
                                 List<BussinesscardEntity> list = new ArrayList<>();
                                 for (int i = 0; i < cardList.size(); i++) {
-                                    long id = cardList.get(i).getStaffId();
+                                    long id = cardList.get(i).getBussinesscardId();
                                     BussinesscardEntity bussinesscardEntity = bussinesscardService.selectOne(new BussinesscardQuery().id(id));
                                     if(!ObjectUtils.isEmpty(bussinesscardEntity)){
                                         list.add(bussinesscardEntity);

enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/service/impl/BussinesscardServiceImpl.java

@@ -82,7 +82,7 @@ public class BussinesscardServiceImpl extends AbstractCRUDServiceImpl<Bussinessc
         BussinesscardEntity entity = this.dao.get(key);
         if(entity!=null){
             if(context!=null && context.getUser()!=null) {
-                FavoritesBusinesscardEntity favoritesBusinesscardEntity = favoritesBusinesscardService.selectOne(new FavoritesBusinesscardQuery().staffId(entity.getStaffId()).userId(context.getUser().getId()));
+                FavoritesBusinesscardEntity favoritesBusinesscardEntity = favoritesBusinesscardService.selectOne(new FavoritesBusinesscardQuery().bussinesscardId(entity.getId()).userId(context.getUser().getId()));
                 if(favoritesBusinesscardEntity!=null){
                     entity.setFavoriteStatus(1);
                 }else {

enterprise-manager/src/main/java/com/mortals/xhx/module/favorites/model/FavoritesBusinesscardEntity.java

@@ -14,7 +14,7 @@ import lombok.Data;
  * 收藏名片实体对象
  *
  * @author zxfei
- * @date 2023-10-10
+ * @date 2024-12-10
  */
 @Data
 public class FavoritesBusinesscardEntity extends FavoritesBusinesscardVo {
@@ -25,9 +25,9 @@ public class FavoritesBusinesscardEntity extends FavoritesBusinesscardVo {
      */
     private Long userId;
     /**
-     * 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
+     * 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
      */
-    private Long staffId;
+    private Long bussinesscardId;
     /**
      * 备注
      */
@@ -54,7 +54,7 @@ public class FavoritesBusinesscardEntity extends FavoritesBusinesscardVo {
 
     public void initAttrValue(){
         this.userId = null;
-        this.staffId = null;
+        this.bussinesscardId = null;
         this.remark = "";
         this.favoriteTime = new Date();
     }

enterprise-manager/src/main/java/com/mortals/xhx/module/favorites/model/FavoritesBusinesscardQuery.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.favorites.model.FavoritesBusinesscardEntity;
  * 收藏名片查询对象
  *
  * @author zxfei
- * @date 2023-10-10
+ * @date 2024-12-10
  */
 public class FavoritesBusinesscardQuery extends FavoritesBusinesscardEntity {
     /** 开始 序号，主键，自增长 */
@@ -40,20 +40,20 @@ public class FavoritesBusinesscardQuery extends FavoritesBusinesscardEntity {
     /** 用户ID,排除列表 */
     private List <Long> userIdNotList;
 
-    /** 开始 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 */
-    private Long staffIdStart;
+    /** 开始 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏 */
+    private Long bussinesscardIdStart;
 
-    /** 结束 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 */
-    private Long staffIdEnd;
+    /** 结束 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏 */
+    private Long bussinesscardIdEnd;
 
-    /** 增加 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏 */
-    private Long staffIdIncrement;
+    /** 增加 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏 */
+    private Long bussinesscardIdIncrement;
 
-    /** 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏列表 */
-    private List <Long> staffIdList;
+    /** 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏列表 */
+    private List <Long> bussinesscardIdList;
 
-    /** 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏排除列表 */
-    private List <Long> staffIdNotList;
+    /** 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏排除列表 */
+    private List <Long> bussinesscardIdNotList;
 
     /** 备注 */
     private List<String> remarkList;
@@ -279,83 +279,83 @@ public class FavoritesBusinesscardQuery extends FavoritesBusinesscardEntity {
 
 
     /**
-     * 获取 开始 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @return staffIdStart
+     * 获取 开始 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @return bussinesscardIdStart
      */
-    public Long getStaffIdStart(){
-        return this.staffIdStart;
+    public Long getBussinesscardIdStart(){
+        return this.bussinesscardIdStart;
     }
 
     /**
-     * 设置 开始 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @param staffIdStart
+     * 设置 开始 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @param bussinesscardIdStart
      */
-    public void setStaffIdStart(Long staffIdStart){
-        this.staffIdStart = staffIdStart;
+    public void setBussinesscardIdStart(Long bussinesscardIdStart){
+        this.bussinesscardIdStart = bussinesscardIdStart;
     }
 
     /**
-     * 获取 结束 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @return $staffIdEnd
+     * 获取 结束 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @return $bussinesscardIdEnd
      */
-    public Long getStaffIdEnd(){
-        return this.staffIdEnd;
+    public Long getBussinesscardIdEnd(){
+        return this.bussinesscardIdEnd;
     }
 
     /**
-     * 设置 结束 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @param staffIdEnd
+     * 设置 结束 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @param bussinesscardIdEnd
      */
-    public void setStaffIdEnd(Long staffIdEnd){
-        this.staffIdEnd = staffIdEnd;
+    public void setBussinesscardIdEnd(Long bussinesscardIdEnd){
+        this.bussinesscardIdEnd = bussinesscardIdEnd;
     }
 
     /**
-     * 获取 增加 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @return staffIdIncrement
+     * 获取 增加 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @return bussinesscardIdIncrement
      */
-    public Long getStaffIdIncrement(){
-        return this.staffIdIncrement;
+    public Long getBussinesscardIdIncrement(){
+        return this.bussinesscardIdIncrement;
     }
 
     /**
-     * 设置 增加 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @param staffIdIncrement
+     * 设置 增加 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @param bussinesscardIdIncrement
      */
-    public void setStaffIdIncrement(Long staffIdIncrement){
-        this.staffIdIncrement = staffIdIncrement;
+    public void setBussinesscardIdIncrement(Long bussinesscardIdIncrement){
+        this.bussinesscardIdIncrement = bussinesscardIdIncrement;
     }
 
     /**
-     * 获取 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @return staffIdList
+     * 获取 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @return bussinesscardIdList
      */
-    public List<Long> getStaffIdList(){
-        return this.staffIdList;
+    public List<Long> getBussinesscardIdList(){
+        return this.bussinesscardIdList;
     }
 
     /**
-     * 设置 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @param staffIdList
+     * 设置 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @param bussinesscardIdList
      */
-    public void setStaffIdList(List<Long> staffIdList){
-        this.staffIdList = staffIdList;
+    public void setBussinesscardIdList(List<Long> bussinesscardIdList){
+        this.bussinesscardIdList = bussinesscardIdList;
     }
 
     /**
-     * 获取 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @return staffIdNotList
+     * 获取 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @return bussinesscardIdNotList
      */
-    public List<Long> getStaffIdNotList(){
-        return this.staffIdNotList;
+    public List<Long> getBussinesscardIdNotList(){
+        return this.bussinesscardIdNotList;
     }
 
     /**
-     * 设置 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @param staffIdNotList
+     * 设置 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @param bussinesscardIdNotList
      */
-    public void setStaffIdNotList(List<Long> staffIdNotList){
-        this.staffIdNotList = staffIdNotList;
+    public void setBussinesscardIdNotList(List<Long> bussinesscardIdNotList){
+        this.bussinesscardIdNotList = bussinesscardIdNotList;
     }
 
 
@@ -758,56 +758,56 @@ public class FavoritesBusinesscardQuery extends FavoritesBusinesscardEntity {
     }
 
     /**
-     * 设置  员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @param staffId
+     * 设置  名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @param bussinesscardId
      */
-    public FavoritesBusinesscardQuery staffId(Long staffId){
-        setStaffId(staffId);
+    public FavoritesBusinesscardQuery bussinesscardId(Long bussinesscardId){
+        setBussinesscardId(bussinesscardId);
         return this;
     }
 
     /**
-     * 设置 开始 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @param staffIdStart
+     * 设置 开始 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @param bussinesscardIdStart
      */
-    public FavoritesBusinesscardQuery staffIdStart(Long staffIdStart){
-        this.staffIdStart = staffIdStart;
+    public FavoritesBusinesscardQuery bussinesscardIdStart(Long bussinesscardIdStart){
+        this.bussinesscardIdStart = bussinesscardIdStart;
         return this;
     }
 
     /**
-     * 设置 结束 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @param staffIdEnd
+     * 设置 结束 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @param bussinesscardIdEnd
      */
-    public FavoritesBusinesscardQuery staffIdEnd(Long staffIdEnd){
-        this.staffIdEnd = staffIdEnd;
+    public FavoritesBusinesscardQuery bussinesscardIdEnd(Long bussinesscardIdEnd){
+        this.bussinesscardIdEnd = bussinesscardIdEnd;
         return this;
     }
 
     /**
-     * 设置 增加 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @param staffIdIncrement
+     * 设置 增加 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @param bussinesscardIdIncrement
      */
-    public FavoritesBusinesscardQuery staffIdIncrement(Long staffIdIncrement){
-        this.staffIdIncrement = staffIdIncrement;
+    public FavoritesBusinesscardQuery bussinesscardIdIncrement(Long bussinesscardIdIncrement){
+        this.bussinesscardIdIncrement = bussinesscardIdIncrement;
         return this;
     }
 
     /**
-     * 设置 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @param staffIdList
+     * 设置 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @param bussinesscardIdList
      */
-    public FavoritesBusinesscardQuery staffIdList(List<Long> staffIdList){
-        this.staffIdList = staffIdList;
+    public FavoritesBusinesscardQuery bussinesscardIdList(List<Long> bussinesscardIdList){
+        this.bussinesscardIdList = bussinesscardIdList;
         return this;
     }
 
     /**
-     * 设置 员工ID, 关联到员工表中的ID，表示这是哪个名片的收藏
-     * @param staffIdNotList
+     * 设置 名片ID, 关联到名片表中的ID，表示这是哪个名片的收藏
+     * @param bussinesscardIdNotList
      */
-    public FavoritesBusinesscardQuery staffIdNotList(List<Long> staffIdNotList){
-        this.staffIdNotList = staffIdNotList;
+    public FavoritesBusinesscardQuery bussinesscardIdNotList(List<Long> bussinesscardIdNotList){
+        this.bussinesscardIdNotList = bussinesscardIdNotList;
         return this;
     }
 

enterprise-manager/src/main/java/com/mortals/xhx/module/favorites/service/impl/FavoritesBusinesscardServiceImpl.java

@@ -36,14 +36,6 @@ public class FavoritesBusinesscardServiceImpl extends AbstractCRUDServiceImpl<Fa
     @Override
     protected void findAfter(FavoritesBusinesscardEntity params, PageInfo pageInfo, Context context, List<FavoritesBusinesscardEntity> list) throws AppException {
 
-        list.forEach(item->{
-            StaffEntity staffCache = staffService.getCache(item.getStaffId().toString());
-
-
-        });
-
-
-
 
     }
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/favorites/web/FavoritesBusinesscardController.java

@@ -53,13 +53,9 @@ public class FavoritesBusinesscardController extends BaseCRUDJsonBodyMappingCont
     @Override
     protected void init(Map<String, Object> model, Context context) {
         super.init(model, context);
-
         this.addDict(model, "userId", userService.find(new UserQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
-        this.addDict(model, "staffId", staffService.find(new StaffQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n)));
-
         this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
 
-
     }
 
 

enterprise-manager/src/main/resources/sqlmap/module/favorites/FavoritesBusinesscardMapper.xml

@@ -7,17 +7,15 @@
     <resultMap type="FavoritesBusinesscardEntity" id="FavoritesBusinesscardEntity-Map">
         <id  property="id" column="id" />
         <result property="userId" column="userId" />
-        <result property="staffId" column="staffId" />
+        <result property="bussinesscardId" column="bussinesscardId" />
         <result property="remark" column="remark" />
         <result property="favoriteTime" column="favoriteTime" />
         <result property="createUserId" column="createUserId" />
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
-
     </resultMap>
 
-
     <!-- 表所有列 -->
     <sql id="_columns">
         <trim suffixOverrides="," suffix="">
@@ -27,8 +25,8 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userId') or colPickMode == 1 and data.containsKey('userId')))">
                 a.userId,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffId') or colPickMode == 1 and data.containsKey('staffId')))">
-                a.staffId,
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('bussinesscardId') or colPickMode == 1 and data.containsKey('bussinesscardId')))">
+                a.bussinesscardId,
             </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
                 a.remark,
@@ -53,18 +51,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="FavoritesBusinesscardEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_favorites_businesscard
-        (userId,staffId,remark,favoriteTime,createUserId,createTime,updateUserId,updateTime)
+        (userId,bussinesscardId,remark,favoriteTime,createUserId,createTime,updateUserId,updateTime)
         VALUES
-        (#{userId},#{staffId},#{remark},#{favoriteTime},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{userId},#{bussinesscardId},#{remark},#{favoriteTime},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_favorites_businesscard
-        (userId,staffId,remark,favoriteTime,createUserId,createTime,updateUserId,updateTime)
+        (userId,bussinesscardId,remark,favoriteTime,createUserId,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.userId},#{item.staffId},#{item.remark},#{item.favoriteTime},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.userId},#{item.bussinesscardId},#{item.remark},#{item.favoriteTime},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -80,11 +78,11 @@
             <if test="(colPickMode==0 and data.containsKey('userIdIncrement')) or (colPickMode==1 and !data.containsKey('userIdIncrement'))">
                 a.userId=ifnull(a.userId,0) + #{data.userIdIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('staffId')) or (colPickMode==1 and !data.containsKey('staffId'))">
-                a.staffId=#{data.staffId},
+            <if test="(colPickMode==0 and data.containsKey('bussinesscardId')) or (colPickMode==1 and !data.containsKey('bussinesscardId'))">
+                a.bussinesscardId=#{data.bussinesscardId},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('staffIdIncrement')) or (colPickMode==1 and !data.containsKey('staffIdIncrement'))">
-                a.staffId=ifnull(a.staffId,0) + #{data.staffIdIncrement},
+            <if test="(colPickMode==0 and data.containsKey('bussinesscardIdIncrement')) or (colPickMode==1 and !data.containsKey('bussinesscardIdIncrement'))">
+                a.bussinesscardId=ifnull(a.bussinesscardId,0) + #{data.bussinesscardIdIncrement},
             </if>
             <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
                 a.remark=#{data.remark},
@@ -134,14 +132,14 @@
                     </choose>
                 </foreach>
             </trim>
-            <trim prefix="staffId=(case" suffix="ELSE staffId end),">
+            <trim prefix="bussinesscardId=(case" suffix="ELSE bussinesscardId end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <choose>
-                        <when test="(colPickMode==0 and item.containsKey('staffId')) or (colPickMode==1 and !item.containsKey('staffId'))">
-                            when a.id=#{item.id} then #{item.staffId}
+                        <when test="(colPickMode==0 and item.containsKey('bussinesscardId')) or (colPickMode==1 and !item.containsKey('bussinesscardId'))">
+                            when a.id=#{item.id} then #{item.bussinesscardId}
                         </when>
-                        <when test="(colPickMode==0 and item.containsKey('staffIdIncrement')) or (colPickMode==1 and !item.containsKey('staffIdIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.staffId,0) + #{item.staffIdIncrement}
+                        <when test="(colPickMode==0 and item.containsKey('bussinesscardIdIncrement')) or (colPickMode==1 and !item.containsKey('bussinesscardIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.bussinesscardId,0) + #{item.bussinesscardIdIncrement}
                         </when>
                     </choose>
                 </foreach>
@@ -309,6 +307,10 @@
     <!-- 条件映射-代参数 -->
     <sql id="_condition_param_">
         <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="permissionSql != null and permissionSql != ''">
+            ${permissionSql}
+        </if>
+
         <if test="conditionParamRef.containsKey('id')">
             <if test="conditionParamRef.id != null">
                 ${_conditionType_} a.id=#{${_conditionParam_}.id}
@@ -368,31 +370,31 @@
             ${_conditionType_} a.userId <![CDATA[ <= ]]> #{${_conditionParam_}.userIdEnd}
         </if>
 
-        <if test="conditionParamRef.containsKey('staffId')">
-            <if test="conditionParamRef.staffId != null ">
-                ${_conditionType_} a.staffId = #{${_conditionParam_}.staffId}
+        <if test="conditionParamRef.containsKey('bussinesscardId')">
+            <if test="conditionParamRef.bussinesscardId != null ">
+                ${_conditionType_} a.bussinesscardId = #{${_conditionParam_}.bussinesscardId}
             </if>
-            <if test="conditionParamRef.staffId == null">
-                ${_conditionType_} a.staffId is null
+            <if test="conditionParamRef.bussinesscardId == null">
+                ${_conditionType_} a.bussinesscardId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
-            ${_conditionType_} a.staffId in
-            <foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('bussinesscardIdList') and conditionParamRef.bussinesscardIdList.size() > 0">
+            ${_conditionType_} a.bussinesscardId in
+            <foreach collection="conditionParamRef.bussinesscardIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('staffIdNotList') and conditionParamRef.staffIdNotList.size() > 0">
-            ${_conditionType_} a.staffId not in
-            <foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('bussinesscardIdNotList') and conditionParamRef.bussinesscardIdNotList.size() > 0">
+            ${_conditionType_} a.bussinesscardId not in
+            <foreach collection="conditionParamRef.bussinesscardIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('staffIdStart') and conditionParamRef.staffIdStart != null">
-            ${_conditionType_} a.staffId <![CDATA[ >= ]]> #{${_conditionParam_}.staffIdStart}
+        <if test="conditionParamRef.containsKey('bussinesscardIdStart') and conditionParamRef.bussinesscardIdStart != null">
+            ${_conditionType_} a.bussinesscardId <![CDATA[ >= ]]> #{${_conditionParam_}.bussinesscardIdStart}
         </if>
-        <if test="conditionParamRef.containsKey('staffIdEnd') and conditionParamRef.staffIdEnd != null">
-            ${_conditionType_} a.staffId <![CDATA[ <= ]]> #{${_conditionParam_}.staffIdEnd}
+        <if test="conditionParamRef.containsKey('bussinesscardIdEnd') and conditionParamRef.bussinesscardIdEnd != null">
+            ${_conditionType_} a.bussinesscardId <![CDATA[ <= ]]> #{${_conditionParam_}.bussinesscardIdEnd}
         </if>
 
 
@@ -533,9 +535,9 @@
                 </foreach>
                 ,
             </if>
-            <if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
-                field(a.staffId,
-                <foreach collection="conditionParamRef.staffIdList" open="" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('bussinesscardIdList') and conditionParamRef.bussinesscardIdList.size() > 0">
+                field(a.bussinesscardId,
+                <foreach collection="conditionParamRef.bussinesscardIdList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
                 ,
@@ -576,9 +578,9 @@
                 </foreach>
                 ,
             </if>
-            <if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
-                field(a.staffId,
-                <foreach collection="conditionParamRef.staffIdList" open="" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('bussinesscardIdList') and conditionParamRef.bussinesscardIdList.size() > 0">
+                field(a.bussinesscardId,
+                <foreach collection="conditionParamRef.bussinesscardIdList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
                 ,
@@ -608,9 +610,9 @@
                     <if test='orderCol.userId != null and "DESC".equalsIgnoreCase(orderCol.userId)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('staffId')">
-                    a.staffId
-                    <if test='orderCol.staffId != null and "DESC".equalsIgnoreCase(orderCol.staffId)'>DESC</if>
+                <if test="orderCol.containsKey('bussinesscardId')">
+                    a.bussinesscardId
+                    <if test='orderCol.bussinesscardId != null and "DESC".equalsIgnoreCase(orderCol.bussinesscardId)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('remark')">