解决代码冲突

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -10,7 +10,9 @@ import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
@@ -131,5 +133,32 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		return firefightersMapper.getFirefightersName();
 
 	}
-
+    /**
+     * 获取指定岗位名称下的队伍人员电话号码信息
+     * @param teamId
+     * @param jobTitleArray
+     * @return
+     */
+	public List<Map<String, Object>> getDetailByTeamIdAndJobTitle(Long teamId,List<String> jobTitleArray) {
+		LambdaQueryWrapper<Firefighters> wrapper = new LambdaQueryWrapper<Firefighters>();
+		wrapper.in(Firefighters::getJobTitle, jobTitleArray);
+		wrapper.eq(Firefighters::getIsDelete, false);
+		wrapper.eq(Firefighters::getFireTeamId, teamId);
+		wrapper.select(Firefighters::getMobilePhone);
+		return	this.baseMapper.selectMaps(wrapper);
+	}
+	 /**
+     * 获取指定用户ID下的队伍人员电话号码信息
+     * @param teamId
+     * @param jobTitleArray
+     * @return
+     */
+	public List<Map<String, Object>> getDetailByIds(List<Long> ids) {
+		LambdaQueryWrapper<Firefighters> wrapper = new LambdaQueryWrapper<Firefighters>();
+		wrapper.in(Firefighters::getSequenceNbr, ids);
+		wrapper.eq(Firefighters::getIsDelete, false);
+		wrapper.select(Firefighters::getMobilePhone);
+		return	this.baseMapper.selectMaps(wrapper);
+	}
+	
 }