Merge remote-tracking branch 'origin/dongdingding' into dongdingding

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetAppController.java
#	ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java
#	ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java
#	ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java
#	ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetOfficialAccountController.java
#	ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetAuditRequest.java
#	ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountServiceImpl.java

ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetAppController.java

@@ -2,6 +2,7 @@ package com.ruoyi.tc.controller;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;

ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetMiniProgramsService.java

@@ -55,7 +55,7 @@ public interface AssetMiniProgramsService extends IService<AssetMiniPrograms> {
     void deleteIdList(List<Long> idList);
 
     /**
-     * 新增小程序数据
+     * 管理端新增小程序数据
      *
      * @param assetMiniPrograms 实体
      * @return 新增结果

ruoyi-admin/src/main/resources/mapper/AssetAppJyMapper.xml

@@ -4,7 +4,7 @@
     <select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetAppJyPo">
         select a.* from asset_app_cp a
         <where>
-            a.task_id is null  or xz_type=1
+            a.task_id is null
             <if test="req.name!=null and req.name!='' ">
                 and a.app_name like concat('%',#{req.name},'%')
             </if>
@@ -14,6 +14,7 @@
             <if test="req.auditState!=null">
                 and a.audit_state =#{req.auditState}
             </if>
+            or xz_type=1
         </where>
         order by a.create_time desc
     </select>

ruoyi-admin/src/main/resources/mapper/AssetCurrentJyMapper.xml

@@ -4,7 +4,7 @@
     <select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetCurrentJyPo">
         select a.* from asset_current_cp a
         <where>
-            a.task_id is null or xz_type=1
+            a.task_id is null
             <if test="req.name!=null and req.name!='' ">
                 and a.xtmc like concat('%',#{req.name},'%')
             </if>
@@ -14,6 +14,7 @@
             <if test="req.auditState!=null">
                 and a.audit_state =#{req.auditState}
             </if>
+            or xz_type=1
         </where>
         order by a.create_time desc
     </select>

ruoyi-admin/src/main/resources/mapper/AssetEmailJyMapper.xml

@@ -4,7 +4,7 @@
     <select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetEmailJyPo">
         select a.* from asset_email_cp a
         <where>
-            a.task_id is null or xz_type=1
+            a.task_id is null
             <if test="req.name!=null and req.name!='' ">
                 and a.dzyxhz like concat('%',#{req.name},'%')
             </if>
@@ -14,6 +14,7 @@
             <if test="req.auditState!=null">
                 and a.audit_state =#{req.auditState}
             </if>
+            or xz_type=1
         </where>
         order by a.create_time desc
     </select>

ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsJyMapper.xml

@@ -14,6 +14,7 @@
             <if test="req.auditState!=null">
                 and a.audit_state = #{req.auditState}
             </if>
+            or xz_type=1
         </where>
         order by a.create_time desc
     </select>

ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountJyMapper.xml

@@ -4,7 +4,7 @@
     <select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo">
         select a.* from asset_official_account_cp a
         <where>
-            a.task_id is null or xz_type=1
+            a.task_id is null
             <if test="req.name!=null and req.name!='' ">
                 and a.gzhmc like concat('%',#{req.name},'%')
             </if>
@@ -14,6 +14,7 @@
             <if test="req.auditState!=null">
                 and a.audit_state =#{req.auditState}
             </if>
+            or xz_type=1
         </where>
         order by a.create_time desc
     </select>