canrd-outside / order-erp · Commits

Commit da6a1823ba931f2e2829761f7db89441d9235d47

Authored by chwork
2 parents f2e15471 5ed2fe71
build: skipped

Merge branch 'fix-main-ch' into 'main' 

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



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