diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java index 48bba95..d705ba5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java @@ -53,7 +53,7 @@ public interface AssetAppCpMapper extends BaseMapper { * @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); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java index a3218e3..08a1f6d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java @@ -45,7 +45,7 @@ public interface AssetEmailCpMapper extends BaseMapper { * @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); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java index a9e4b26..2c67231 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java @@ -46,7 +46,7 @@ public interface AssetOfficialAccountCpMapper extends BaseMapper emailNewList = appList.stream() + List emailNewList = emailCpPoListList.stream() .map(cpPo -> { AssetEmail current = new AssetEmail(); BeanUtils.copyProperties(cpPo, current); // 复制属性 @@ -572,7 +572,7 @@ public class AssetTaskServiceImpl extends ServiceImpl miniNewList = appList.stream() + List miniNewList = miniProgramsCpPoListList.stream() .map(cpPo -> { AssetMiniPrograms current = new AssetMiniPrograms(); BeanUtils.copyProperties(cpPo, current); // 复制属性 @@ -591,7 +591,7 @@ public class AssetTaskServiceImpl extends ServiceImpl officialNewList = appList.stream() + List officialNewList = officialAccountCpPoListList.stream() .map(cpPo -> { AssetOfficialAccount current = new AssetOfficialAccount(); BeanUtils.copyProperties(cpPo, current); // 复制属性 diff --git a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml index 66ff94b..18ba45f 100644 --- a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml +++ b/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) + + AND ( + + FIND_IN_SET(#{type}, b.type) + + ) + ) AND a.del_flag = '0' diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 04cab7d..5d83220 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/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();