解决冲突代码

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IMaintenanceCompanyService.java

@@ -69,7 +69,7 @@ public interface IMaintenanceCompanyService {
 	 * @param maintenanceType 类型（COMPANY单位，PERSON人员，DEPARTMENT部门）
 	 * @return
 	 */
-	List<Map<String, Object>> getAllMaintenanceList(String maintenanceType, String amosUserId);
+	List<Map<String, Object>> getAllMaintenanceList(String maintenanceType);
 
 	/**
 	 * 查询分页展示的维保人员/单位/部门列表信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/MaintenanceCompanyController.java

@@ -113,8 +113,7 @@ public class MaintenanceCompanyController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "所有维保人员/单位/部门列表，不分页", notes = "所有维保人员列表")
 	public ResponseModel<List<Map<String, Object>>> getAllMaintenanceList(@RequestParam String maintenanceType) {
 		AgencyUserModel amosUser = getUserInfo();
-		return ResponseHelper.buildResponse(maintenanceCompanyService.getAllMaintenanceList(maintenanceType,
-				amosUser.getUserId()));
+		return ResponseHelper.buildResponse(maintenanceCompanyService.getAllMaintenanceList(maintenanceType));
 	}
 
 	/**