Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserPositionTempVo.java

@@ -30,6 +30,8 @@ public class AppUserPositionTempVo {
     @ApiModelProperty(value = "职位名")
     private String positionName;
 
+    private Integer positionId;
+
     @ApiModelProperty(value = "数据状态 1：已核销 2：未核销")
     private Integer status;
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -131,6 +131,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
             String postionName = postionMap == null ? "" : postionMap.get(appUserPositionTemp.getPositionId()).getName();
             appUserPositionTempVo.setPositionName(postionName);
             appUserPositionTempVo.setStatus(appUserPositionTemp.getUserId() == null ? DataStatus.NO_USERED.code : DataStatus.USERED.code);
+            appUserPositionTempVos.add(appUserPositionTempVo);
         }
 
         dataVO.setData(appUserPositionTempVos);