1.非空校验

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/RegUnitInfoController.java

@@ -65,6 +65,9 @@ public class RegUnitInfoController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "单位注册校验", notes = "单位注册校验")
     public ResponseModel<RegUnitInfoDto> unitCheck(@PathVariable String unitCode,
                                                    @RequestParam String unitType) {
+        if(ValidationUtil.isEmpty(unitCode)){
+            throw new BadRequest("单位编码不能为空");
+        }
         RegUnitInfoDto regUnitInfoDto = iRegUnitInfoService.unitCheck(unitCode, unitType);
         return ResponseHelper.buildResponse(regUnitInfoDto);
     }
@@ -91,7 +94,10 @@ public class RegUnitInfoController extends BaseController {
     @GetMapping(value = "/{tel}/sendTelCode")
     @ApiOperation(httpMethod = "GET", value = "发送手机号验证码", notes = "发送手机号验证码")
     public ResponseModel<Boolean> sendTelCode(@PathVariable(value = "tel") String tel) {
-        Boolean flag = false;
+        if (ValidationUtil.isEmpty(tel)) {
+            throw new BadRequest("手机号不能为空");
+        }
+        Boolean flag;
         HashMap<String, String> params = new HashMap<>();
         String code = this.getRandomCode();
         params.put("code", code);
@@ -133,6 +139,7 @@ public class RegUnitInfoController extends BaseController {
             String redisCode = redisUtils.get(RedisKey.FLC_USER_TEL + tel).toString();
             if (code.equals(redisCode)) {
                 flag = true;
+                redisUtils.del(RedisKey.FLC_USER_TEL + tel);
             }
         }
         return ResponseHelper.buildResponse(flag);
@@ -142,9 +149,9 @@ public class RegUnitInfoController extends BaseController {
     @GetMapping(value = "/{userName}/hasExistUser")
     @ApiOperation(httpMethod = "GET", value = "判断用户是否存在", notes = "判断用户是否存在")
     public ResponseModel<Boolean> hasExistUser(@PathVariable(value = "userName") String userName) {
-        Boolean flag = false;
+        boolean flag = false;
         AgencyUserModel user = Privilege.agencyUserClient.queryByUserName(userName).getResult();
-        if (user != null) {
+            if (user != null) {
             flag = true;
         }
         return ResponseHelper.buildResponse(flag);

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java

@@ -207,8 +207,10 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
         regUnitIcService.remove(new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, unitCode));
         // 5.许可信息删除
         baseUnitLicenceService.remove(new LambdaQueryWrapper<BaseUnitLicence>().eq(BaseUnitLicence::getUnitCode, unitCode));
-        // 6.企业数据信息 删除
+        // 6.企业数据信息删除
         tzBaseEnterpriseInfoService.remove(new LambdaQueryWrapper<TzBaseEnterpriseInfo>().eq(TzBaseEnterpriseInfo::getUseCode, unitCode));
+        // 7.机场单位表信息删除
+        iOrgUsrService.remove(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getAmosOrgId, companyId));
         return Boolean.TRUE;
     }