commit

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

@@ -84,8 +84,8 @@ public class EnterpriseCertificationController {
     @PostMapping("/update")
     @ApiOperation(value = "修改", response = EnterpriseCertification.class)
     public R update(@RequestBody @ApiParam(name = "企业实名认证信息记录对象", value = "传入json格式", required = true) EnterpriseCertification enterpriseCertification, HttpServletRequest request) {
-        String accountId = TokenUtils.getIdByJwtToken(request);
+       /* String accountId = TokenUtils.getIdByJwtToken(request);
-        enterpriseCertification.setAccountId(Integer.valueOf(accountId));
+        enterpriseCertification.setAccountId(Integer.valueOf(accountId));*/
         boolean updateState = service.updateById(enterpriseCertification);
         return updateState ? R.ok() : R.error("编辑失败");
     }

users/src/main/java/com/huoran/users/entity/EnterpriseCertification.java

@@ -101,6 +101,11 @@ public class EnterpriseCertification implements Serializable {
     @TableField(exist = false)
     private String city;
 
+    @ApiModelProperty(value = "团队id")
+    @TableField(exist = false)
+    private Integer teamId;
+
+
 
     @ApiModelProperty(value = "认证状态(0默认未认证 1.认证中2.已认证)")
     private Integer authenticationStatus;

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

@@ -14,7 +14,8 @@
         a.account,
         c.*,
         IFNULL( cla.province, '未完善' ) AS province,
-        IFNULL( cla.city, '未完善' ) AS city
+        IFNULL( cla.city, '未完善' ) AS city,
+        cla.id AS teamId
         FROM
         hr_enterprise_certification c
         INNER JOIN hr_user_account a ON a.id = c.account_id
@@ -23,6 +24,7 @@
         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
+        AND is_team = 1
         AND cla.is_del = 0
         WHERE
         a.is_del = 0
@@ -75,7 +77,8 @@
                     a.account,
                     c.*,
                     IFNULL( cla.province, '未完善' ) AS province,
-                    IFNULL( cla.city, '未完善' ) AS city
+                    IFNULL( cla.city, '未完善' ) AS city,
+                    cla.id AS teamId
                 FROM
                     hr_enterprise_certification c
                         INNER JOIN hr_user_account a ON a.id = c.account_id
@@ -84,6 +87,7 @@
                         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
+                        AND is_team = 1
                         AND cla.is_del = 0
                 WHERE
                     a.is_del = 0