Merge branch 'sprint/S1' into develop

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/staff/StaffGetEAIService.java

@@ -60,7 +60,7 @@ public class StaffGetEAIService extends AbsEAIService {
             if (!CollectionUtils.isEmpty(staffEntities)) {
                 List<Long> idList = staffEntities.stream().map(StaffEntity::getId).collect(Collectors.toList());
                 LambdaUpdateWrapper<StaffEntity> lmu = new LambdaUpdateWrapper<>();
-                lmu.set(StaffEntity::getTabStatus, TabStatusEnums.PENDING);
+                lmu.set(StaffEntity::getTabStatus, TabStatusEnums.PENDING.getValue());
                 lmu.in(StaffEntity::getId, idList);
                 staffService.update(lmu);
                 //修改查询到的参数
@@ -69,7 +69,7 @@ public class StaffGetEAIService extends AbsEAIService {
                 });
             }
             return EAIUtil.buildEAIResult(new JSONObject().fluentPut("wait_register_personnel", staffEntities));
-        } else if (OptionEnums.TASK.equals(option)) {
+        } else if (OptionEnums.TASK.getValue().equals(option)) {
             List<StaffEntity> list = request.getObject("wait_register_personnel", StaffUtil.LIST_ENTITY_STAFF);
             LambdaQueryWrapper<StaffEntity> lmq = new LambdaQueryWrapper<>();
             lmq.eq(StaffEntity::getTenantSid, SecurityUtil.getUserProfile().getTenantSid());
@@ -84,7 +84,7 @@ public class StaffGetEAIService extends AbsEAIService {
             });
             List<StaffEntity> staffEntities = staffRepository.selectList(lmq);
             return EAIUtil.buildEAIResult(new JSONObject().fluentPut("wait_register_personnel", staffEntities));
-        } else if (OptionEnums.BASIC.equals(option)) {
+        } else if (OptionEnums.BASIC.getValue().equals(option)) {
             List<StaffEntity> list = request.getObject("wait_register_personnel", StaffUtil.LIST_ENTITY_STAFF);
             LambdaQueryWrapper<StaffEntity> lmq = new LambdaQueryWrapper<>();
             lmq.eq(StaffEntity::getTenantSid, SecurityUtil.getUserProfile().getTenantSid());