Merge remote-tracking branch 'origin/meiteng' into zql

src/main/java/org/rcisoft/business/bpersonvalue/controller/BPersonValueController.java

@@ -2,6 +2,7 @@ package org.rcisoft.business.bpersonvalue.controller;
 
 
 /*固定导入*/
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -32,6 +33,7 @@ import java.util.List;
 /**
 * Created by  on 2019-11-13 13:28:38.
 */
+@Api(tags = "16 用户积分操作")
 @RestController
 @RequestMapping("bpersonvalue")
 public class BPersonValueController extends PaginationController<BPersonValue> {
@@ -56,7 +58,7 @@ public class BPersonValueController extends PaginationController<BPersonValue> {
     @GetMapping(value = "/add")
     public Result add (CurUser curUser, @Valid PersonValueDto personValueDto,BindingResult bindingResult) {
         int line = bPersonValueServiceImpl.add(personValueDto,curUser.getCorpId());
-        return Result.builder(new PersistModel(1),
+        return Result.builder(new PersistModel(line),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
                 personValueDto);

src/main/java/org/rcisoft/business/breleasevalue/dao/BReleaseValueRepository.java

@@ -122,7 +122,7 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
      * @param businessId
      * @return
      */
-    @Select("select sum(value) valueConsume from b_person_value where type = 1 and del_flag !=1 and flag = 1 and user_id = #{businessId}")
+    @Select("select sum(value) valueConsume from b_person_value where type = 1 and del_flag !=1 and flag = 1 and person_id = #{businessId}")
     String getValueConsume(@Param("businessId")String businessId);
 }