登录校验

src/main/java/com/dk/oauth/controller/oauth/AccessTokenController.java

@@ -213,4 +213,14 @@ public class AccessTokenController {
         return authAccessTokenService.logout(userLogin);
     }
 
+    /**
+     * @desc : 获取公司的所有者的数量
+     * @author : jyh
+     * @date : 2023/1/5 10:09
+     */
+    @PostMapping("/oauth/wx/get_owner_count")
+    public ResponseResultVO getOwnerCount(@RequestBody UserWxLogin userLogin) {
+        return authAccessTokenService.getOwnerCount(userLogin.getUserId());
+    }
+
 }

src/main/java/com/dk/oauth/entity/CompanyResponse.java

@@ -2,6 +2,7 @@ package com.dk.oauth.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
+import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
@@ -55,6 +56,13 @@ public class CompanyResponse {
     private LocalDate userEndDate;
 
     /**
+     * 所有者 (t_wx_user)
+     */
+    @ApiModelProperty(value = "所有者 (t_wx_user)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String owner;
+
+    /**
      * 人数上限 (可以绑定微信的员工人数)
      */
     @ApiModelProperty(value = "人数上限 (可以绑定微信的员工人数)")

src/main/java/com/dk/oauth/service/IAuthAccessTokenService.java

@@ -47,4 +47,6 @@ public interface IAuthAccessTokenService extends IService<AuthAccessToken> {
     ResponseResultVO<?> getWxQrCode(Map<String,Object> map);
 
     ResponseResultVO logout(UserWxLogin userWxLogin);
+
+    ResponseResultVO<?> getOwnerCount(String uuid);
 }

src/main/java/com/dk/oauth/service/impl/AuthAccessTokenServiceImpl.java

@@ -440,7 +440,9 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
      */
     @Transactional(rollbackFor = Exception.class)
     public ResponseResultVO logout(UserWxLogin userWxLogin) {
-        userMapper.updateWxid(userWxLogin.getUserId(), null);
+//        userMapper.updateWxid(userWxLogin.getUserId(), null);
+//        更新cpid为空 240701
+        userMapper.updateCpid(userWxLogin.getUserId(), null, null);
         return ResponseResultUtil.success();
     }
 
@@ -566,7 +568,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                         // 判断是否到期
                         LocalDate nowDate = LocalDate.now();
                         if(endDate.isBefore(nowDate)){
-                            return ResponseResultUtil.error(ErrorCodeEnum.LICENSE_OVER_DATE.getCode(), ErrorCodeEnum.LICENSE_OVER_DATE.getMessage());
+                            return ResponseResultUtil.error(ErrorCodeEnum.LICENSE_OVER_DATE.getCode(), ErrorCodeEnum.LICENSE_OVER_DATE.getMessage(),userLogin);
                         }
                     }
                     if(licenseMap.get("web_max_num") != null){
@@ -753,4 +755,18 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
         return base + "/";
     }
 
+
+    /**
+     * @desc : 获取公司的所有者的数量
+     * @author : jyh
+     * @date : 2024-02-20 17:00
+     */
+    public ResponseResultVO<?> getOwnerCount(String uuid) {
+        Company company = new Company().setOwner(uuid).setFlgValid(true);
+        List<Company> companies = companyMapper.selectByCond(company);
+        int count =  (companies!=null && companies.size() > 0)?companies.size():0;
+        return ResponseResultUtil.success(count);
+    }
+
+
 }

src/main/resources/mapper/CompanyMapper.xml

@@ -24,6 +24,7 @@
         <result column="license" property="license"/>
         <result column="cp_manager" property="cpManager"/>
         <result column="cp_phone" property="cpPhone"/>
+        <result column="owner" property="owner" typeHandler="UuidTypeHandler"/>
     </resultMap>
 
     <resultMap type="com.dk.oauth.entity.MenuFrequency" id="ResultMenuMap">
@@ -73,7 +74,7 @@
                tac.cp_phone,
 --                tac.grade_code,
 --                tac.end_date,
---                tac.max_staff_num,
+               tac.owner,
                tac.cur_staff_num,
                tss.svc_ip,
                tss.svc_port
@@ -140,7 +141,7 @@
                 AND t.op_db_user = #{opDbUser}
             </if>
             <if test="owner != null and owner != ''">
-                AND t.owner = #{owner}
+                AND t.owner = #{owner}::uuid
             </if>
         </where>
     </sql>