社团报名及审核问题修改

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationSigninController.java

@@ -87,21 +87,24 @@ public class SchoolOrganizationSigninController extends BaseController
     @PostMapping("/approve")
     @PostMapping("/approve")
     public AjaxResult approve(@RequestBody signinApprove2Vo vo)
     public AjaxResult approve(@RequestBody signinApprove2Vo vo)
     {
     {
+        SchoolOrganizationSignin signin = schoolOrganizationSigninService.getById(vo.getId());
         SchoolOrganizationSignin so = new SchoolOrganizationSignin();
         SchoolOrganizationSignin so = new SchoolOrganizationSignin();
         so.setId(vo.getId());
         so.setId(vo.getId());
         so.setStatus(vo.getStatus());
         so.setStatus(vo.getStatus());
         //同意后还要将当前人员数据插入到社团成员表中
         //同意后还要将当前人员数据插入到社团成员表中
-        if (StringUtils.equals(vo.getStatus(),"2")){
+        if (signin!=null && StringUtils.equals(so.getStatus(),"2")){
             SchoolOrganizationMember member = new SchoolOrganizationMember();
             SchoolOrganizationMember member = new SchoolOrganizationMember();
-            member.setCid(so.getCid());
-            member.setName(so.getName());
-            member.setGrade(so.getGrade());
-            member.setClasses(so.getClasses());
-            member.setOrgName(so.getOrgName());
-            member.setPhone(so.getPhone());
-            member.setSex(so.getSex());
-            member.setUserId(so.getUserId());
-            schoolOrganizationMemberService.save(member);
+            member.setCid(signin.getCid());
+            member.setName(signin.getName());
+            member.setGrade(signin.getGrade());
+            member.setClasses(signin.getClasses());
+            member.setOrgName(signin.getOrgName());
+            member.setPhone(signin.getPhone());
+            member.setSex(signin.getSex());
+            member.setUserId(signin.getUserId());
+            member.setCardid(signin.getCardid());
+            boolean save = schoolOrganizationMemberService.save(member);
+            System.out.println(save);
         }
         }
         return toAjax(schoolOrganizationSigninService.updateById(so));
         return toAjax(schoolOrganizationSigninService.updateById(so));
     }
     }

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationSignin.java

@@ -62,4 +62,7 @@ public class SchoolOrganizationSignin extends OurBaseEntity
     /** userId */
     /** userId */
     private Long userId;
     private Long userId;
 
 
+    /** 身份证号 */
+    private String cardid;
+
 }
 }

smart-campus/src/main/resources/mapper/organization/SchoolOrganizationSigninMapper.xml

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="userId"    column="user_id"    />
         <result property="userId"    column="user_id"    />
+        <result property="cardid"    column="cardid"    />
     </resultMap>
     </resultMap>