Merge remote-tracking branch 'origin/main'

users/src/main/java/com/huoran/users/controller/EnterpriseCertificationController.java

@@ -67,7 +67,7 @@ public class EnterpriseCertificationController {
 
 
     @PostMapping("/save")
-    @ApiOperation(value = "新增", response = EnterpriseCertification.class)
+    @ApiOperation(value = "新增(注册后调用此接口，传值状态0默认未提交)", response = EnterpriseCertification.class)
     public R save(@RequestBody @ApiParam(name = "企业实名认证信息记录对象", value = "传入json格式", required = true) EnterpriseCertification enterpriseCertification, HttpServletRequest request) {
         String accountId = TokenUtils.getIdByJwtToken(request);
         enterpriseCertification.setAccountId(Integer.valueOf(accountId));

users/src/main/java/com/huoran/users/mapper/xml/EnterpriseCertificationMapper.xml

@@ -9,7 +9,7 @@
         FROM
         (
         SELECT
-        IFNULL( info.company_name, u.user_name ) proposer,
+        IFNULL( info.real_name, u.user_name ) AS proposer,
         a.phone AS contactInformation,
         a.account,
         c.*,
@@ -19,7 +19,7 @@
         hr_enterprise_certification c
         INNER JOIN hr_user_account a ON a.id = c.account_id
         INNER JOIN hr_user_info u ON u.user_id = a.user_id
-        LEFT JOIN hr_enterprise_certification info ON info.account_id = a.id
+        LEFT JOIN hr_user_authentication_information info ON info.account_id = a.id
         LEFT JOIN k_platform_team_account ta ON ta.account_id = a.id
         LEFT JOIN k_platform_team t ON ta.manage_id = t.manage_id
         LEFT JOIN k_platform_team_classification cla ON cla.id = t.classification_id