姜永辉 1 éve
szülő
commit
c87002f5f8

+ 1 - 1
src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -191,7 +191,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             companyVO.setWebMaxNum(0);
             companyVO.setWxMaxNum(1);
         }
-        company.setCpStatus("企业状态-通过");
+        company.setCpStatus("公司状态-通过");
         //获取具体服务的地址
         company.setSvcCode(companyMapper.selectServiceAllot(company.getGradeCode()));
         // 生成临时license授权

+ 1 - 1
src/main/resources/mapper/ActivityMapper.xml

@@ -83,7 +83,7 @@
           AND ti.flg_valid
           AND now( ) >= T.begin_date
           AND ( T.end_date IS NULL OR T.end_date + '1 day' :: INTERVAL >= now( ) )
-          AND ( T.cp_ids IS NULL OR 1 = ANY ( T.cp_ids ) )
+          AND ( T.cp_ids IS NULL OR #{cpId} = ANY ( T.cp_ids ) )
         <if test="appCode != null and appCode != ''">
             And t.app_code = #{appCode}
         </if>