列表增加taku_public_key

yt-agent/agent-service/src/main/java/com/ytpm/service/impl/YtAppUserServiceImpl.java

@@ -2,6 +2,7 @@ package com.ytpm.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ytpm.advertise.param.ComprehensiveReportParam;
@@ -82,7 +83,7 @@ public class YtAppUserServiceImpl implements YtAppUserService {
         }
         String appIds = ytApps.stream().map(YtApp::getAppId).collect(Collectors.joining(","));
         Map<String, YtApp> appMap = ytApps.stream().collect(Collectors.toMap(YtApp::getAppId, o->o));
-        param.setAppIds(appIds);
+        param.setAppIds(CharSequenceUtil.isBlank(param.getAppIds())?appIds:param.getAppIds());
         ResultTable<YtAppUserListView> resultTable = appFeign.queryAll(param);
         setUserExtInfo(resultTable,appMap);
         return resultTable;

yt-common/src/main/java/com/ytpm/middle/view/AppListVO.java

@@ -54,4 +54,7 @@ public class AppListVO {
     /** 企业信用代码 */
     @ApiModelProperty("企业信用代码")
     private String creditCode;
+    /** Taku访问key */
+    @ApiModelProperty("Taku访问key")
+    private String takuPublicKey;
 }

yt-middle/middle-platform/src/main/resources/mapper/AgentMapper.xml

@@ -71,6 +71,7 @@
         me.available,
         pu.login_name,
         pu.user_type,
+        me.taku_public_key,
         pu1.nick_name createUserName
         from yt_middle_enterprise me
         join yt_platform_user pu on me.user_id = pu.user_id

yt-middle/middle-platform/src/main/resources/mapper/AppMapper.xml

@@ -96,7 +96,8 @@
             me.enterprise_name,
             me.legal,
             me.concat_phone,
-            me.credit_code
+            me.credit_code,
+            me.taku_public_key
         from yt_platform_user_app pua
         left join yt_middle_enterprise me on pua.user_id = me.user_id
         <where>

yt-middle/middle-platform/src/main/resources/mapper/EnterpriseMapper.xml

@@ -13,6 +13,7 @@
              concat_phone,
              business_licence,
              registry_address,
+             taku_public_key,
              create_time,
              create_user_id,
              available
@@ -27,6 +28,7 @@
              #{concatPhone},
              #{businessLicence},
              #{registryAddress},
+             #{takuPublicKey},
              #{createTime},
              #{createUserId},
              #{available}
@@ -62,6 +64,9 @@
             <if test="updateUserId != null">
                 update_user_id = #{updateUserId},
             </if>
+            <if test="takuPublicKey != null">
+                taku_public_key = #{takuPublicKey},
+            </if>
             <if test="available != null">
                 available = #{available}
             </if>
@@ -71,7 +76,7 @@
 
     <select id="getByCode" resultType="com.ytpm.middle.model.YtMiddleEnterprise">
         select
-            enterprise_id, user_id, enterprise_name, credit_code, legal, legal_card, concat_phone, business_licence, registry_address, create_time, create_user_id, update_time, update_user_id, available
+            enterprise_id,taku_public_key, user_id, enterprise_name, credit_code, legal, legal_card, concat_phone, business_licence, registry_address, create_time, create_user_id, update_time, update_user_id, available
         from yt_middle_enterprise
         where credit_code = #{creditCode}
     </select>