资产修改

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java

@@ -250,7 +250,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                     QueryWrapper<AssetMiniPrograms> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("ssdw", part);
                     queryWrapper.eq("isbf", 0);
-                    List<AssetMiniPrograms> list = assetMiniProgramsService.list(queryWrapper);
+                    queryWrapper.eq("del_flag", 0);
+                    List<AssetMiniPrograms> list = assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getSsdw, part).eq(AssetMiniPrograms::getIsbf,0).eq(AssetMiniPrograms::getDelFlag,0).list();
                     List<AssetMiniProgramsCpPo> miniProgramsNewList = list.stream()
                             .map(cpPo -> {
                                 AssetMiniProgramsCpPo assetMiniProgramsCpPo = new AssetMiniProgramsCpPo();
@@ -271,7 +272,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                     QueryWrapper<AssetOfficialAccount> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("ssdw", part);
                     queryWrapper.eq("isbf", 0);
-                    List<AssetOfficialAccount> list = assetOfficialAccountService.list(queryWrapper);
+                    queryWrapper.eq("del_flag", 0);
+                    List<AssetOfficialAccount> list = assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getSsdw, part).eq(AssetOfficialAccount::getIsbf,0).eq(AssetOfficialAccount::getDelFlag,0).list();
                     List<AssetOfficialAccountCpPo> officialAccountProgramsNewList = list.stream()
                             .map(cpPo -> {
                                 AssetOfficialAccountCpPo assetOfficialAccountCpPo = new AssetOfficialAccountCpPo();
@@ -292,7 +294,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                     QueryWrapper<AssetEmail> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("ssdw", part);
                     queryWrapper.eq("isbf", 0);
-                    List<AssetEmail> list = assetEmailService.list(queryWrapper);
+                    queryWrapper.eq("del_flag", 0);
+                    List<AssetEmail> list = assetEmailService.lambdaQuery().eq(AssetEmail::getSsdw, part).eq(AssetEmail::getIsbf,0).eq(AssetEmail::getDelFlag,0).list();;
                     List<AssetEmailCpPo> emailCpNewList = list.stream()
                             .map(cpPo -> {
                                 AssetEmailCpPo emailCpPo = new AssetEmailCpPo();
@@ -313,7 +316,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                     QueryWrapper<AssetApp> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("ssdw", part);
                     queryWrapper.eq("isbf", 0);
-                    List<AssetApp> list = assetAppService.list(queryWrapper);
+                    queryWrapper.eq("del_flag", 0);
+                    List<AssetApp> list = assetAppService.lambdaQuery().eq(AssetApp::getSsdw, part).eq(AssetApp::getIsbf,0).eq(AssetApp::getDelFlag,0).list();
                     List<AssetAppCpPo> appCpNewList = list.stream()
                             .map(cpPo -> {
                                 AssetAppCpPo appCpPo = new AssetAppCpPo();

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

@@ -36,7 +36,7 @@
     <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(*)
         from asset_app
-        where ssdw = #{part} and isbf=0
+        where ssdw = #{part} and isbf=0 and del_flag=0
     </select>
 </mapper>
 

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

@@ -462,6 +462,6 @@
 
         select count(*)
         from asset_current
-        where dwmc = #{part} and isbf=0
+        where dwmc = #{part} and isbf=0 and del_flag=0
     </select>
 </mapper>

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

@@ -36,7 +36,7 @@
     <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(*)
         from asset_email
-        where ssdw = #{part} and isbf=0
+        where ssdw = #{part} and isbf=0 and del_flag=0
     </select>
 </mapper>
 

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

@@ -37,7 +37,7 @@
     <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(*)
         from asset_mini_programs
-        where ssdw = #{part} and isbf=0
+        where ssdw = #{part} and isbf=0 and del_flag=0
     </select>
 </mapper>
 

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

@@ -16,7 +16,7 @@
     <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(*)
         from asset_official_account
-        where ssdw = #{part} and isbf=0
+        where ssdw = #{part} and isbf=0 and del_flag=0
     </select>
     <select id="page" resultType="com.ruoyi.tc.entity.AssetOfficialAccount">
         select * from asset_official_account

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

@@ -155,7 +155,22 @@
                 </foreach>
                 )
             </if>
-            ) AND a.del_flag = '0'
+            ) AND a.del_flag = 0
+            <if test="req.type!= null and req.type.indexOf('0') != -1">
+                and cr.del_flag=0
+            </if>
+            <if test="req.type!= null and req.type.indexOf('1') != -1">
+                and pr.del_flag=0
+            </if>
+            <if test="req.type!= null and req.type.indexOf('2') != -1">
+                and ac.del_flag=0
+            </if>
+            <if test="req.type!= null and req.type.indexOf('3') != -1">
+                and em.del_flag=0
+            </if>
+            <if test="req.type!= null and req.type.indexOf('4') != -1">
+                and ap.del_flag=0
+            </if>
 
             <if test="req.nickName != null and req.nickName != '' ">
                 and a.nick_name like concat('%',#{req.nickName},'%')