【org】完善注释和变量命名

kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java

@@ -25,7 +25,7 @@ import javax.annotation.Resource;
 public class HrPositionController {
 
     @Resource
-    private HrPositionService syspositionService;
+    private HrPositionService hrPositionService;
 
     /**
      * 添加系统职位
@@ -35,7 +35,7 @@ public class HrPositionController {
      */
     @PostResource(name = "添加系统职位", path = "/hrPosition/add")
     public ResponseData add(@RequestBody @Validated(HrPositionRequest.add.class) HrPositionRequest hrPositionRequest) {
-        syspositionService.add(hrPositionRequest);
+        hrPositionService.add(hrPositionRequest);
         return new SuccessResponseData();
     }
 
@@ -47,7 +47,7 @@ public class HrPositionController {
      */
     @PostResource(name = "编辑系统职位", path = "/hrPosition/edit")
     public ResponseData edit(@RequestBody @Validated(HrPositionRequest.edit.class) HrPositionRequest hrPositionRequest) {
-        syspositionService.edit(hrPositionRequest);
+        hrPositionService.edit(hrPositionRequest);
         return new SuccessResponseData();
     }
 
@@ -59,7 +59,7 @@ public class HrPositionController {
      */
     @PostResource(name = "删除系统职位", path = "/hrPosition/delete")
     public ResponseData delete(@RequestBody @Validated(HrPositionRequest.delete.class) HrPositionRequest hrPositionRequest) {
-        syspositionService.delete(hrPositionRequest);
+        hrPositionService.delete(hrPositionRequest);
         return new SuccessResponseData();
     }
 
@@ -71,7 +71,7 @@ public class HrPositionController {
      */
     @PostResource(name = "更新职位状态", path = "/hrPosition/updateStatus")
     public ResponseData updateStatus(@RequestBody @Validated(BaseRequest.updateStatus.class) HrPositionRequest hrPositionRequest) {
-        syspositionService.updateStatus(hrPositionRequest);
+        hrPositionService.updateStatus(hrPositionRequest);
         return new SuccessResponseData();
     }
 
@@ -83,7 +83,7 @@ public class HrPositionController {
      */
     @GetResource(name = "查看详情系统职位", path = "/hrPosition/detail")
     public ResponseData detail(@Validated(HrPositionRequest.detail.class) HrPositionRequest hrPositionRequest) {
-        return new SuccessResponseData(syspositionService.detail(hrPositionRequest));
+        return new SuccessResponseData(hrPositionService.detail(hrPositionRequest));
     }
 
     /**
@@ -94,7 +94,7 @@ public class HrPositionController {
      */
     @GetResource(name = "分页查询系统职位", path = "/hrPosition/page")
     public ResponseData page(HrPositionRequest hrPositionRequest) {
-        return new SuccessResponseData(syspositionService.page(hrPositionRequest));
+        return new SuccessResponseData(hrPositionService.page(hrPositionRequest));
     }
 
     /**
@@ -105,7 +105,7 @@ public class HrPositionController {
      */
     @GetResource(name = "获取全部系统职位", path = "/hrPosition/list")
     public ResponseData list(HrPositionRequest hrPositionRequest) {
-        return new SuccessResponseData(syspositionService.list(hrPositionRequest));
+        return new SuccessResponseData(hrPositionService.list(hrPositionRequest));
     }
 
 }

kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java

@@ -131,7 +131,10 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
 
     @Override
     public void updateStatus(HrOrganizationRequest hrOrganizationRequest) {
+
+        // 先查询有没有这条记录再更新
         HrOrganization hrOrganization = this.queryOrganization(hrOrganizationRequest);
+
         LambdaUpdateWrapper<HrOrganization> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(HrOrganization::getOrgId, hrOrganization.getOrgId());
         updateWrapper.set(HrOrganization::getStatusFlag, hrOrganizationRequest.getStatusFlag());

kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java

@@ -82,7 +82,10 @@ public class HrPositionServiceImpl extends ServiceImpl<HrPositionMapper, HrPosit
 
     @Override
     public void updateStatus(HrPositionRequest hrPositionRequest) {
+
+        // 先查询有没有这条记录，再更新
         HrPosition sysPosition = this.querySysPosition(hrPositionRequest);
+
         LambdaUpdateWrapper<HrPosition> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(HrPosition::getPositionId, sysPosition.getPositionId());
         updateWrapper.set(HrPosition::getStatusFlag, hrPositionRequest.getStatusFlag());
@@ -161,11 +164,11 @@ public class HrPositionServiceImpl extends ServiceImpl<HrPositionMapper, HrPosit
      * @date 2020/11/18 22:59
      */
     private HrPosition querySysPosition(HrPositionRequest hrPositionRequest) {
-        HrPosition sysposition = this.getById(hrPositionRequest.getPositionId());
+        HrPosition hrPosition = this.getById(hrPositionRequest.getPositionId());
-        if (ObjectUtil.isEmpty(sysposition)) {
+        if (ObjectUtil.isEmpty(hrPosition)) {
             String userTip = StrUtil.format(PositionExceptionEnum.CANT_FIND_POSITION.getUserTip(), hrPositionRequest.getPositionId());
             throw new SystemModularException(PositionExceptionEnum.CANT_FIND_POSITION, userTip);
         }
-        return sysposition;
+        return hrPosition;
     }
 }