修复家庭成员bug

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/my/AppFamilyMembersController.java

@@ -16,6 +16,7 @@ import org.jeecg.modules.system.app.service.IFamilyMembersService;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -46,20 +47,21 @@ public class AppFamilyMembersController {
 
     @PostMapping("/addFamilyMembers")
     @Operation(summary = "添加家庭成员")
+    @Transactional
     public Result<String> addFamilyMembers(@Validated @RequestBody AddFamilyMembersDTO addFamilyMembersDTO){
-        if (StringUtils.isEmpty(addFamilyMembersDTO.getUserId())){
-            LoginUser principal = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            String userId=principal.getId();
-            addFamilyMembersDTO.setUserId(userId);
-        }else {
+        if (addFamilyMembersDTO.getRealNameStatus()!=1){
+            return Result.error("该添加人员未实名，无法进行添加");
+        }
+        if (StringUtils.isNotEmpty(addFamilyMembersDTO.getUserId())){
             SysUser sysUser = iSysUserService.getById(addFamilyMembersDTO.getUserId());
             if (sysUser==null||sysUser.getDelFlag()==1){
                 return Result.error("该添加人员未查询到所属用户，无法进行添加");
             }
+            iFamilyMembersService.addFamilyMembers(addFamilyMembersDTO);
         }
-        if (addFamilyMembersDTO.getRealNameStatus()!=1){
-            return Result.error("该添加人员未实名，无法进行添加");
-        }
+        LoginUser principal = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userId=principal.getId();
+        addFamilyMembersDTO.setUserId(userId);
         return iFamilyMembersService.addFamilyMembers(addFamilyMembersDTO);
     }
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/AddFamilyMembersDTO.java

@@ -32,11 +32,11 @@ public class AddFamilyMembersDTO {
     @Schema(description = "身份证号")
     private String identityCard;
     /**身份证正面照*/
-//    @NotBlank(message = "身份证正面照不允许为空")
+    @NotBlank(message = "身份证正面照不允许为空")
     @Schema(description = "身份证正面照")
     private String idCardFrontImg;
     /**身份证反面照*/
-//    @NotBlank(message = "身份证反面照不允许为空")
+    @NotBlank(message = "身份证反面照不允许为空")
     @Schema(description = "身份证反面照")
     private String idCardBackImg;
     /**手机号*/
@@ -48,7 +48,7 @@ public class AddFamilyMembersDTO {
     @NotNull(message = "实名状态不允许为空")
     private Integer realNameStatus;
     /**身份证反面照*/
-//    @NotBlank(message = "实名认证照片不允许为空")
+    @NotBlank(message = "实名认证照片不允许为空")
     @Schema(description = "实名认证照片")
     private String realNameImg;