Merge remote-tracking branch 'origin/master'

fs-service/src/main/resources/application-config-druid-jzzx.yml

@@ -46,6 +46,10 @@ wx:
         secret: 1afa05f0c71beff0d52fb849c62e479a # 公众号的appsecret
         token: PPKOdAlCoMO # 接口配置里的Token值
         aesKey: Eswa6VjwtVMCcw03qZy6fWllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
+  # 开放平台app微信授权配置
+  open:
+    app-id: wxe4d352ea8ddbcf3c
+    secret: be6c179d79fcf97cbfb0b36c08877220
 aifabu:  #爱链接
   appKey: 7b471be905ab17e00f3b858c6710dd117601d008
 watch:

fs-service/src/main/resources/mapper/company/CompanyMapper.xml

@@ -232,7 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCompanyByIds2" parameterType="Long" resultType="Company">
         <include refid="selectCompanyVo"/>
-        where company_id in
+        where is_del = 0 and company_id in
         <foreach item="companyId" collection="companyIds" open="(" separator="," close=")">
             #{companyId}
         </foreach>