资产修改

ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java

@@ -53,7 +53,7 @@ public interface AssetAppCpMapper extends BaseMapper<AssetAppCpPo> {
      * @param taskId 任务id
      * @param btgyy 不通过原因
      */
-    @Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
+    @Update("update asset_app_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
     void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy);
 
 

ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java

@@ -45,7 +45,7 @@ public interface AssetEmailCpMapper extends BaseMapper<AssetEmailCpPo> {
      * @param taskId 任务id
      * @param btgyy 不通过原因
      */
-    @Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
+    @Update("update asset_email_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
     void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy);
 
 }

ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java

@@ -46,7 +46,7 @@ public interface AssetOfficialAccountCpMapper extends BaseMapper<AssetOfficialAc
      * @param taskId 任务id
      * @param btgyy 不通过原因
      */
-    @Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
+    @Update("update asset_official_account_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
     void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy);
 
 }

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

@@ -554,7 +554,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
             assetEmailService.deleteIdList(emailidList);
         }
         //将子表数据复制到主表中
-        List<AssetEmail> emailNewList = appList.stream()
+        List<AssetEmail> emailNewList = emailCpPoListList.stream()
                 .map(cpPo -> {
                     AssetEmail current = new AssetEmail();
                     BeanUtils.copyProperties(cpPo, current); // 复制属性
@@ -572,7 +572,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
             assetMiniProgramsService.deleteIdList(miniidList);
         }
         //将子表数据复制到主表中
-        List<AssetMiniPrograms> miniNewList = appList.stream()
+        List<AssetMiniPrograms> miniNewList = miniProgramsCpPoListList.stream()
                 .map(cpPo -> {
                     AssetMiniPrograms current = new AssetMiniPrograms();
                     BeanUtils.copyProperties(cpPo, current); // 复制属性
@@ -591,7 +591,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
             assetOfficialAccountService.deleteIdList(officialidList);
         }
         //将子表数据复制到主表中
-        List<AssetOfficialAccount> officialNewList = appList.stream()
+        List<AssetOfficialAccount> officialNewList = officialAccountCpPoListList.stream()
                 .map(cpPo -> {
                     AssetOfficialAccount current = new AssetOfficialAccount();
                     BeanUtils.copyProperties(cpPo, current); // 复制属性

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

@@ -148,7 +148,13 @@
             FROM asset_task b
             where
             b.task_status = 1 AND FIND_IN_SET(a.nick_name, b.dwmc)
-            AND FIND_IN_SET(#{req.type}, b.type)
+            <if test="req.type != null">
+                AND (
+                <foreach item="type" collection="req.type.split(',')" separator=" OR ">
+                    FIND_IN_SET(#{type}, b.type)
+                </foreach>
+                )
+            </if>
             ) AND a.del_flag = '0'
 
             <if test="req.nickName != null and req.nickName != '' ">

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -115,7 +115,7 @@ public class SecurityConfig
                     // 静态资源，可匿名访问
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                     .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
-//                        .antMatchers("/unit/assetTask/**","/tc/**","/unit/assetLc/**","/tc/unit/**").permitAll()
+                        .antMatchers("/unit/assetTask/**","/tc/**","/unit/assetLc/**","/tc/unit/**").permitAll()
                         // 除上面外的所有请求全部需要鉴权认证
                         .antMatchers("/tc/without/**").permitAll()
                         .anyRequest().authenticated();