1、修改新建企业时获取默认票据

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

@@ -441,7 +441,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         map.put("listComMenu", listComMenu);
 
         //  打印票据
-        List<PrintLayout> printLayoutResponses = printLayoutMapper.selectByCond(new PrintLayout());
+        List<PrintLayout> printLayoutResponses = printLayoutMapper.selectByCond(new PrintLayout().setFlgValid(true));
         List<Map<String, Object>> listPrintLayout = new ArrayList<>();
         for (int i = 0; i < printLayoutResponses.size(); i++) {
             m = new HashMap<>();

src/main/resources/mapper/ActivityMapper.xml

@@ -55,6 +55,7 @@
         </if>
         <if test="flgBanner != null ">
             And t.flg_banner = #{flgBanner}
+            AND t.activity_url IS NOT NULL
         </if>
         <if test="activityTypeList != null ">
             AND t.activity_type = ANY(#{activityTypeList,typeHandler=StringListTypeHandler})

src/main/resources/mapper/PrintLayoutMapper.xml

@@ -48,9 +48,6 @@
             <if test="remarks != null and remarks != ''">
                 AND remarks = #{remarks}
             </if>
-            <if test="cpId != null">
-                AND cp_id = #{cpId}
-            </if>
             <if test="flgValidList != null and flgValidList.size()>0">
                 AND flg_valid = any(#{flgValidList, typeHandler=BooleanListTypeHandler})
             </if>