微信小程序signup接口修改10 添加log,修改数据结构

xueyi-api/xueyi-api-tenant/src/main/java/com/xueyi/tenant/api/tenant/domain/po/SysEnterpriseStaff.java

@@ -14,17 +14,19 @@ import java.io.Serial;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = "sys_enterprise_staff")
+@TableName(value = "sys_enterprise_staff", excludeProperty = {"name","sort","createBy","createTime","updateBy","updateTime","remark","tenantId"})
 public class SysEnterpriseStaff extends TBaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
 
+    protected Long id;
+
     protected Long staffId;
 
     protected String phone;
 
-    private Long tenantId;
+    private Long tId;//租户号
 
     private String openid;
 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/DmStaffController.java

@@ -143,7 +143,7 @@ public class DmStaffController extends BaseController<DmStaffQuery, DmStaffDto,
             SysEnterpriseStaff enterpriseStaff = new SysEnterpriseStaff();
             enterpriseStaff.setPhone(dmStaff.getPhone());
             enterpriseStaff.setStaffId(dmStaff.getId());
-            enterpriseStaff.setTenantId(SecurityContextHolder.getEnterpriseId());
+            enterpriseStaff.setTId(SecurityContextHolder.getEnterpriseId());
             tenantService.saveEnterpriseStaff(enterpriseStaff, SecurityConstants.INNER);
         }
         AjaxResult result = super.add(dmStaff);

xueyi-modules/xueyi-tenant/src/main/java/com/xueyi/tenant/tenant/controller/TeTenantController.java

@@ -107,7 +107,11 @@ public class TeTenantController extends BaseController<TeTenantQuery, TeTenantDt
     @InnerAuth
     @PostMapping("/save-staff")
     R<SysEnterpriseStaff> staff(@RequestBody SysEnterpriseStaff staff) {
-        staffMapper.insert(staff);
+        if (staff.getId() != null) {
+            staffMapper.updateById(staff);
+        } else {
+            staffMapper.insert(staff);
+        }
         return R.ok(staff);
     }
     /**

xueyi-modules/xueyi-tenant/src/main/resources/mapper/SysEnterpriseStaffMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.xueyi.tenant.tenant.mapper.SysEnterpriseStaffMapper">
 
     <select id="selectTenantByPhone" resultType="com.xueyi.tenant.api.tenant.domain.po.TeTenantPo" parameterType="Object">
-        select * from te_tenant where id = (select tenant_id from sys_enterprise_staff where (phone = #{phone} or openid = #{phone}) and del_flag = 0 limit 1)
+        select * from te_tenant where id = (select t_id from sys_enterprise_staff where (phone = #{phone} or openid = #{phone}) and del_flag = 0 limit 1)
     </select>
 
     <select id="selectStaffByPhone" resultType="com.xueyi.tenant.api.tenant.domain.po.SysEnterpriseStaff" parameterType="Object">