根据UID判重不添加单位条件

src/main/java/com/zzsn/leaderbase/service/CharacterBasicInfoService.java

@@ -58,7 +58,7 @@ public interface CharacterBasicInfoService extends IService<CharacterBasicInfo>
     
     List<CharacterBasicInfo> getAllList(BasicInfoListVo basicInfoListVo);
 
-    CharacterBasicInfo getBasicInfoByUid(String uid, String department, String basicInfoDepartment);
+    CharacterBasicInfo getBasicInfoByUid(String category,String uid);
 
     CharacterBasicInfo getByNameAndByDepartment(String category, String typeId, String name, String department);
     

src/main/java/com/zzsn/leaderbase/service/impl/CharacterBasicInfoServiceImpl.java

@@ -277,11 +277,9 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
     }
 
     @Override
-    public CharacterBasicInfo getBasicInfoByUid(String category,String uid, String department) {
+    public CharacterBasicInfo getBasicInfoByUid(String category,String uid) {
         LambdaQueryWrapper<CharacterBasicInfo> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(CharacterBasicInfo::getUid,uid);
-        //新增过滤，因为根据uid 查询出来的数据，可能存在多个，所以需要根据部门进行过滤
-        queryWrapper.eq(CharacterBasicInfo::getDepartment,department);
         queryWrapper.eq(CharacterBasicInfo::getCategory,category);
         return baseMapper.selectOne(queryWrapper);
     }
@@ -381,7 +379,7 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
                     //检查是否已有数据
                     CharacterBasicInfo oldBasicInfo = null;
                     if (StringUtils.isNotEmpty(basicInfo.getUid())) {
-                        oldBasicInfo = getBasicInfoByUid(category, basicInfo.getUid(), basicInfo.getDepartment());
+                        oldBasicInfo = getBasicInfoByUid(category, basicInfo.getUid());
                     } else {
                         oldBasicInfo = getByNameAndByDepartment(category, basicInfo.getTypeId(), basicInfo.getName(), basicInfo.getDepartment());
                     }