fixed 后台角色管理

fuint-application/src/main/java/com/fuint/common/service/impl/DutyServiceImpl.java

@@ -165,7 +165,7 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
      */
     @Override
     public TDuty findByName(Integer merchantId, String name) {
-        return this.tDutyMapper.findByName(name);
+        return this.tDutyMapper.findByName(merchantId, name);
     }
 
     /**
@@ -188,7 +188,7 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "新增后台角色")
     public void saveDuty(TDuty duty, List<TSource> sources) throws BusinessCheckException {
-        TDuty existsDuty = tDutyMapper.findByName(duty.getDutyName());
+        TDuty existsDuty = tDutyMapper.findByName(duty.getMerchantId(), duty.getDutyName());
         if (existsDuty != null) {
             throw new BusinessCheckException("角色名称已经存在.");
         }

fuint-repository/src/main/java/com/fuint/repository/mapper/TDutyMapper.java

@@ -17,7 +17,7 @@ public interface TDutyMapper extends BaseMapper<TDuty> {
 
     List<TDuty> findByIdIn(@Param("ids") List<Integer> ids);
 
-    TDuty findByName(@Param("name") String name);
+    TDuty findByName(@Param("merchantId") Integer merchantId, @Param("name") String name);
 
     List<Long> getRoleIdsByAccountId(@Param("accountId") Integer accountId);
 }