Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempFindDTO.java

@@ -15,4 +15,5 @@ public class AppUserPositionTempFindDTO extends PageParam {
      private String name;
      private Integer status;
      private Integer companyId;
+     private Integer positionId;
 }

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

@@ -53,5 +53,5 @@ public class AppUserPositionTempVo {
     private String companyName;
 
   @ApiModelProperty(value = "员工职位状态 0：在职 1：离职")
-    private Integer idQuit;
+    private Integer isQuit;
 }

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

@@ -131,6 +131,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         if (StringUtils.isNotEmpty(appUserPositionTempFindDTO.getName())) {
             criteria.andLike("name", String.format("%%%s%%", appUserPositionTempFindDTO.getName().trim()));
         }
+        if (Objects.nonNull(appUserPositionTempFindDTO.getPositionId())) {
+            criteria.andEqualTo("positionId", appUserPositionTempFindDTO.getPositionId());
+        }
         if (StringUtils.isNotEmpty(appUserPositionTempFindDTO.getPhone())) {
             criteria.andEqualTo("phone", appUserPositionTempFindDTO.getPhone());
         }
@@ -168,7 +171,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
             String jobName = jobMap == null ? "" : jobMap.get(appUserPositionTemp.getJobId()) == null ? "" : jobMap.get(appUserPositionTemp.getJobId()).getName();
             appUserPositionTempVo.setPositionName(postionName);
             appUserPositionTempVo.setJobName(jobName);
-            appUserPositionTempVo.setIdQuit(appUserPositionTemp.getIsQuit());
+            appUserPositionTempVo.setIsQuit(appUserPositionTemp.getIsQuit());
             appUserPositionTempVo.setStatus(appUserPositionTemp.getUserId() == null ? DataStatus.NO_USERED.code : appUserPositionTemp.getUserId() == 0 ? DataStatus.NO_USERED.code : DataStatus.USERED.code);
             appUserPositionTempVos.add(appUserPositionTempVo);
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java

@@ -114,8 +114,7 @@ public class AppUserPositionController {
         try {
             IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
             Integer operatorId = Integer.valueOf(infoFromToken.getId());
-            appUserPositionTempBiz.addUserPositionChangeRecord(appUserPositionTempDTO.getChangeStatus(), appUserPositionTempDTO, operatorId);
-            return ObjectRestResponse.succ();
+            return ObjectRestResponse.succ(appUserPositionTempBiz.addUserPositionChangeRecord(appUserPositionTempDTO.getChangeStatus(), appUserPositionTempDTO, operatorId));
         } catch (Exception e) {
             log.error("修改失败【{}】", e);
             throw new BaseException("修改失败");
@@ -134,13 +133,12 @@ public class AppUserPositionController {
     /**
      * 员工复职位
      */
-    @GetMapping("/updAddPositionChangeRecord")
+    @PostMapping("/updAddPositionChangeRecord")
     public ObjectRestResponse updAddPositionChangeRecord(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO, HttpServletRequest request) {
         try {
             IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
             Integer operatorId = Integer.valueOf(infoFromToken.getId());
-            appUserPositionTempBiz.andAddUserPositionChangeRecord(appUserPositionTempDTO,operatorId);
-            return ObjectRestResponse.succ();
+            return ObjectRestResponse.succ(appUserPositionTempBiz.andAddUserPositionChangeRecord(appUserPositionTempDTO, operatorId));
         } catch (Exception e) {
             log.error("修改失败【{}】", e);
             throw new BaseException("修改失败");

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeBiz.java

@@ -86,7 +86,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
 				}});
 				log.info("活动邀请注册：activityPopularize = {}", activityPopularize.toString());
 				if (activityPopularize != null) {
-                    String lockKey = String.format("%s%d:%d:%d", registerQueueDTO.getAppUserId(), registerQueueDTO.getInParamDTO().getUsername(), activityPopularize.getId());
+                    String lockKey = String.format("%s%d:%s:%d",registerQueueDTO.getInParamDTO().getActivityCode(), registerQueueDTO.getAppUserId(), registerQueueDTO.getInParamDTO().getUsername(), activityPopularize.getId());
                     RLock rLock = redissonLock.getRLock(lockKey);
                     try {
                         boolean isSuccess = rLock.tryLock(5, 5, TimeUnit.SECONDS);