修复已删除的邮件配置也会被列入校验的情况

chenhang4442024
1 parent b04d4ca0
Showing 2 changed files with 2 additions and 2 deletions
src/main/java/com/order/erp/mapper/order/ReceiveEmailMappingMapper.java
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
@@ -21,7 +21,7 @@ public interface ReceiveEmailMappingMapper extends BaseMapper&lt;ReceiveEmailMappin
     ReceiveEmailMappingDO getReceiveEmailMappingDO(@Param("id") Long id);
 @Select("select * from receive_email_mapping where enable_flag in (#{10},#{30})")
     List<ReceiveEmailMappingDO> listGetAll(@Param("10")int enableFlag,@Param("30") int enableFlag1);
-    @Select("select * from receive_email_mapping where type_value = #{typeValue}")
+    @Select("select * from receive_email_mapping where enable_flag != 20 and type_value = #{typeValue}")
     List<ReceiveEmailMappingDO> byTypeValueReceiveEmailMappingDO(@Param("typeValue") String  typeValue);
 }
@@ -217,7 +217,7 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         if(Constant.SIX==adminUserVO.getRoleId().intValue()){
       List<DictionaryDO> dictionaryDOList = dictionaryService.list(new LambdaQueryWrapper<DictionaryDO>()
                     .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .eq(DictionaryDO::getDictCode,RoleEnum.PRODUCE_USER.getName()));
+                    .eq(DictionaryDO::getDictName,RoleEnum.PRODUCE_USER.getName()));
             if(CollectionUtils.isNotEmpty(dictionaryDOList) && !dictionaryDOList.contains(adminUserVO.getNickName())){
                 DictionaryVO dictionaryVO = new DictionaryVO();
                 dictionaryVO.setRemark("生产科");