Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss-server-oauth

src/main/java/com/dk/oauth/model/pojo/integral/CouponReceive.java

@@ -50,6 +50,7 @@ public class CouponReceive extends PageInfo<CouponReceive> implements Serializab
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
+    @TableField(fill = FieldFill.INSERT)
     private Integer cpId;
 
 

src/main/java/com/dk/oauth/model/pojo/integral/CouponSend.java

@@ -45,6 +45,7 @@ public class CouponSend extends PageInfo<CouponSend> implements Serializable {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
+    @TableField(fill = FieldFill.INSERT)
     private Integer cpId;
 
 

src/main/java/com/dk/oauth/model/pojo/integral/CouponUse.java

@@ -51,6 +51,7 @@ public class CouponUse extends PageInfo<CouponUse> implements Serializable {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
+    @TableField(fill = FieldFill.INSERT)
     private Integer cpId;
 
 

src/main/java/com/dk/oauth/model/pojo/integral/Integral.java

@@ -41,6 +41,7 @@ public class Integral extends PageInfo<Integral> implements Serializable {
      */
 //    @TableId(value = "cp_id", type = IdType.AUTO)
     @ApiModelProperty(value = "公司ID")
+    @TableField(fill = FieldFill.INSERT)
     private Integer cpId;
 
 

src/main/java/com/dk/oauth/model/pojo/integral/IntegralItem.java

@@ -67,6 +67,7 @@ public class IntegralItem extends PageInfo<IntegralItem> implements Serializable
      */
     @Excel(name = "公司ID")
     @ApiModelProperty(value = "公司ID")
+    @TableField(fill = FieldFill.INSERT)
     private Integer cpId;
 
 

src/main/java/com/dk/oauth/model/pojo/integral/IntegralShare.java

@@ -51,6 +51,7 @@ public class IntegralShare extends PageInfo<IntegralShare> implements Serializab
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
+    @TableField(fill = FieldFill.INSERT)
     private Integer cpId;
 
 

src/main/java/com/dk/oauth/model/pojo/integral/SignRecord.java

@@ -61,6 +61,7 @@ public class SignRecord extends PageInfo<SignRecord> implements Serializable {
      */
     @Excel(name = "公司ID")
     @ApiModelProperty(value = "公司ID")
+    @TableField(fill = FieldFill.INSERT)
     private Integer cpId;
 
 

src/main/java/com/dk/oauth/model/query/integral/IntegralItemQuery.java

@@ -1,6 +1,7 @@
 package com.dk.oauth.model.query.integral;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
@@ -60,6 +61,7 @@ public class IntegralItemQuery extends PageInfo<IntegralItemQuery>  {
      */
     @Excel(name = "公司ID")
     @ApiModelProperty(value = "公司ID")
+    @TableField(fill = FieldFill.INSERT)
     private Integer cpId;
 
 

src/main/java/com/dk/oauth/model/query/integral/IntegralQuery.java

@@ -1,6 +1,7 @@
 package com.dk.oauth.model.query.integral;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;

src/main/java/com/dk/oauth/model/query/integral/IntegralShareQuery.java

@@ -1,6 +1,7 @@
 package com.dk.oauth.model.query.integral;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
@@ -43,6 +44,7 @@ public class IntegralShareQuery extends PageInfo<IntegralShareQuery>  {
      * 公司ID
      */
     @ApiModelProperty(value = "公司ID")
+    @TableField(fill = FieldFill.INSERT)
     private Integer cpId;
 
 

src/main/java/com/dk/oauth/model/query/integral/SignRecordQuery.java

@@ -1,6 +1,7 @@
 package com.dk.oauth.model.query.integral;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
@@ -45,6 +46,7 @@ public class SignRecordQuery extends PageInfo<SignRecordQuery>{
      */
     @Excel(name = "公司ID")
     @ApiModelProperty(value = "公司ID")
+    @TableField(fill = FieldFill.INSERT)
     private Integer cpId;
 
 

src/main/java/com/dk/oauth/service/integral/CouponReceiveService.java

@@ -87,7 +87,7 @@ public class CouponReceiveService extends BaseService<CouponReceive> {
         // 限制助力链接发出本人不可给自己助力  2024/08/01 刘尧
         UserLogin userLogin = userMapper.selectById(couponReceiveVO.getUserIdForm());
 
-        if (userLogin.getUserWxid().equals(couponReceiveVO.getUserWxid())) {
+        if (userLogin != null && userLogin.getUserWxid().equals(couponReceiveVO.getUserWxid())) {
             //助力链接发出者不能为自己助力
             throw new BaseBusinessException(ErrorCodeEnum.USER_POWER_OWN.getCode(), ErrorCodeEnum.USER_POWER_OWN.getMessage());
         }